diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 90dcdfe25..a83e8c871 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/68.0.3440.42', + 'chromium_checkout': 'refs/tags/68.0.3440.75', } diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index 86c36f822..7d9aa8bd5 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -266,7 +266,7 @@ index d05dd5421458..fa13775f0512 100644 // a BrowserPlugin even when we are using cross process frames for guests. It // should be removed after resolving https://crbug.com/642826). diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc -index 8aa4bd7ffca6..0a649863f381 100644 +index 07f7fb42f539..82a98fc9edd4 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc @@ -193,6 +193,8 @@ void MimeHandlerViewGuest::CreateWebContents( @@ -277,8 +277,8 @@ index 8aa4bd7ffca6..0a649863f381 100644 + delegate_->OverrideWebContentsCreateParams(¶ms); // TODO(erikchen): Fix ownership semantics for guest views. // https://crbug.com/832879. - callback.Run(WebContents::Create(params).release()); -@@ -228,6 +230,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const { + callback.Run( +@@ -232,6 +234,18 @@ bool MimeHandlerViewGuest::ShouldDestroyOnDetach() const { return true; } diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index e4ea865d2..9b7b0c125 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -94,10 +94,10 @@ index b23698013a09..d60eb48c6efd 100644 "WillFailRequest state should come before WillProcessResponse"); return render_frame_host_; diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index 7f8d8da28de6..b058d7f43a7a 100644 +index daff8c65a981..3faa788f1e6f 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -1581,6 +1581,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1599,6 +1599,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -105,7 +105,7 @@ index 7f8d8da28de6..b058d7f43a7a 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -3346,9 +3347,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { +@@ -3456,9 +3457,9 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { @@ -118,7 +118,7 @@ index 7f8d8da28de6..b058d7f43a7a 100644 // TODO(https://crbug.com/813479): Investigate why we need to explicitly // specify task runner for BrowserThread::IO here. // Bind calls to the BindRegistry should come on to the IO thread by -@@ -3624,9 +3625,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -3858,9 +3859,9 @@ void RenderFrameHostImpl::CommitNavigation( // however only do this for cross-document navigations, because the // alternative would be redundant effort. network::mojom::URLLoaderFactoryPtrInfo default_factory_info; @@ -131,7 +131,7 @@ index 7f8d8da28de6..b058d7f43a7a 100644 if (subresource_loader_params && subresource_loader_params->loader_factory_info.is_valid()) { // If the caller has supplied a default URLLoaderFactory override (for -@@ -4318,8 +4319,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( +@@ -4552,8 +4553,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory( this, false /* is_navigation */, false /* is_download */, &default_factory_request); @@ -275,10 +275,10 @@ index 4e11056a3dc9..973ad50975e1 100644 const std::string& mime_type, bool allow_wildcard, diff --git content/common/frame_messages.h content/common/frame_messages.h -index 3ed93bdae0e3..c03780d69cfb 100644 +index 98bc62f6c937..d235b67810dd 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h -@@ -1363,8 +1363,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, +@@ -1376,8 +1376,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, // Used to get the list of plugins. |main_frame_origin| is used to handle // exceptions for plugin content settings. @@ -289,7 +289,7 @@ index 3ed93bdae0e3..c03780d69cfb 100644 url::Origin /* main_frame_origin */, std::vector /* plugins */) -@@ -1372,9 +1373,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, +@@ -1385,9 +1386,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins, // type. If there is no matching plugin, |found| is false. // |actual_mime_type| is the actual mime type supported by the // found plugin. @@ -389,10 +389,10 @@ index 74a031ad10c3..3b3f9e292f4b 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 33356adf00d6..9d8d91eed735 100644 +index c027c4df3423..a2f9ef9de0a3 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3253,7 +3253,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3256,7 +3256,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -402,7 +402,7 @@ index 33356adf00d6..9d8d91eed735 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -3610,6 +3611,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { +@@ -3613,6 +3614,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); @@ -412,7 +412,7 @@ index 33356adf00d6..9d8d91eed735 100644 void RenderFrameImpl::WillCommitProvisionalLoad() { diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index 1e68c2fee634..75d5dfade01f 100644 +index 06f7d4487997..5c2519ebf2f1 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -876,6 +876,8 @@ void RenderThreadImpl::Init( diff --git a/patch/patches/message_loop_443_1992243003.patch b/patch/patches/message_loop_443_1992243003.patch index f2797cd86..00e40d82f 100644 --- a/patch/patches/message_loop_443_1992243003.patch +++ b/patch/patches/message_loop_443_1992243003.patch @@ -34,7 +34,7 @@ index c5016dcf20a2..cf1db622f8fb 100644 #if !defined(OS_NACL) diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc -index 8e6f1f41def2..b07865ebae37 100644 +index 68bb4c084653..d3995c4c403e 100644 --- base/message_loop/message_pump_win.cc +++ base/message_loop/message_pump_win.cc @@ -11,6 +11,7 @@ @@ -45,7 +45,7 @@ index 8e6f1f41def2..b07865ebae37 100644 #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h" -@@ -369,20 +370,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) { +@@ -381,20 +382,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) { } bool MessagePumpForUI::ProcessPumpReplacementMessage() { diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 5e416b6c1..9d57151bc 100644 --- a/patch/patches/print_header_footer_1478_1565.patch +++ b/patch/patches/print_header_footer_1478_1565.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 3b9eb8dc8ca7..c37db3071302 100644 +index c514878fafe7..32e4c499d242 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -894,6 +894,7 @@ split_static_library("ui") { diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index dd4d9e9a6..79b344ef5 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -306,7 +306,7 @@ index db44e03f061a..fbba4710aca3 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 6fbecc82f14a..ab2edb9e86b1 100644 +index 5ccfa4398c71..0d5e22d341ab 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -727,11 +727,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -468,7 +468,7 @@ index 6fbecc82f14a..ab2edb9e86b1 100644 AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create)); diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h -index dad662e0ef1c..97799607ff1d 100644 +index b418b4c8a0ad..30817ff2e0fd 100644 --- content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h @@ -89,7 +89,6 @@ class ResourceMessageFilter; @@ -488,7 +488,7 @@ index dad662e0ef1c..97799607ff1d 100644 SiteInstance* site_instance, bool is_for_guests_only); -@@ -441,7 +440,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -438,7 +437,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Use CreateRenderProcessHost() instead of calling this constructor // directly. RenderProcessHostImpl(BrowserContext* browser_context, @@ -497,7 +497,7 @@ index dad662e0ef1c..97799607ff1d 100644 bool is_for_guests_only); // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected -@@ -710,10 +709,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -707,10 +706,10 @@ class CONTENT_EXPORT RenderProcessHostImpl // called. int instance_id_ = 1; diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 78aa08374..422368b0a 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 093e585d7e98..ec8ebab9f9cf 100644 +index 6ae9bf2f9c6a..a4b929545e3e 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -1814,21 +1814,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1845,21 +1845,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -45,7 +45,7 @@ index 093e585d7e98..ec8ebab9f9cf 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2436,6 +2445,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2467,6 +2476,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -61,7 +61,7 @@ index 093e585d7e98..ec8ebab9f9cf 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2466,7 +2484,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2497,7 +2515,7 @@ void WebContentsImpl::CreateNewWindow( // TODO(brettw): It seems bogus that we have to call this function on the // newly created object and give it one of its own member variables. new_view->CreateViewForWidget( @@ -70,7 +70,7 @@ index 093e585d7e98..ec8ebab9f9cf 100644 } // Save the created window associated with the route so we can show it // later. -@@ -5760,7 +5778,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -5791,7 +5809,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view = @@ -95,7 +95,7 @@ index df508da0aef2..f6f4bf42b108 100644 WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index d538915cd4c6..f7c14f42a5ce 100644 +index dee5814a247c..c9e57ef5680b 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -74,9 +74,11 @@ class BrowserPluginGuestDelegate; diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 9da9f7046..f0f85f385 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -62,10 +62,10 @@ index f98ae01cd46d..bba0b1930bff 100644 void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id, diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index f0c55c05da71..9f0ede2594e4 100644 +index 5686e6a06d6f..9e65585bdb0b 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1228,7 +1228,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1241,7 +1241,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr;