diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 655c2a6eb..a846da80a 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/69.0.3497.12', + 'chromium_checkout': 'refs/tags/69.0.3497.32', } diff --git a/libcef/renderer/render_urlrequest_impl.cc b/libcef/renderer/render_urlrequest_impl.cc index 9562e2243..4d8688a31 100644 --- a/libcef/renderer/render_urlrequest_impl.cc +++ b/libcef/renderer/render_urlrequest_impl.cc @@ -117,7 +117,8 @@ class CefRenderURLRequest::Context loader_ = CefContentRendererClient::Get()->url_loader_factory()->CreateURLLoader( - urlRequest, task_runner_.get()); + urlRequest, blink::scheduler::WebResourceLoadingTaskRunnerHandle:: + CreateUnprioritized(task_runner_.get())); loader_->LoadAsynchronously(urlRequest, url_client_.get()); return true; } diff --git a/patch/patches/browser_compositor_mac.patch b/patch/patches/browser_compositor_mac.patch index e026110a2..292afcc5c 100644 --- a/patch/patches/browser_compositor_mac.patch +++ b/patch/patches/browser_compositor_mac.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h -index 513e70d2b738..f821043e0a4e 100644 +index 46be85eea4b5..06177efbb25d 100644 --- content/browser/renderer_host/browser_compositor_view_mac.h +++ content/browser/renderer_host/browser_compositor_view_mac.h -@@ -59,6 +59,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, +@@ -58,6 +58,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, // These will not return nullptr until Destroy is called. DelegatedFrameHost* GetDelegatedFrameHost(); @@ -12,10 +12,10 @@ index 513e70d2b738..f821043e0a4e 100644 // Ensure that the currect compositor frame be cleared (even if it is // potentially visible). diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm -index 72ad272b4d1a..0b4cd87019bf 100644 +index 92afcc779106..222e7a528522 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -87,6 +87,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() { +@@ -86,6 +86,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() { return delegated_frame_host_.get(); } diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index e880acd61..a06b318f3 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -208,10 +208,10 @@ index 9e3511a9dabc..83dfee968d59 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h -index 2e3f4f8a56d4..75ef26b5381a 100644 +index 7f80c1b1d829..bcbd04bc4e6c 100644 --- content/browser/web_contents/web_contents_view_mac.h +++ content/browser/web_contents/web_contents_view_mac.h -@@ -96,7 +96,7 @@ class WebContentsViewMac : public WebContentsView, +@@ -97,7 +97,7 @@ class WebContentsViewMac : public WebContentsView, gfx::NativeView context) override; RenderWidgetHostViewBase* CreateViewForWidget( RenderWidgetHost* render_widget_host, @@ -221,7 +221,7 @@ index 2e3f4f8a56d4..75ef26b5381a 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm -index 03d7c9c7dcce..e84c1787a84d 100644 +index 94848b568363..4dea19adb512 100644 --- content/browser/web_contents/web_contents_view_mac.mm +++ content/browser/web_contents/web_contents_view_mac.mm @@ -345,7 +345,8 @@ void WebContentsViewMac::CreateView( diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index e2a0c46ce..ccd1c85a9 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 343c8a0fbfeb..68c73fa1c5f0 100644 +index b5d398fd0882..11552886dc36 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/compositor_1368.patch b/patch/patches/compositor_1368.patch index b2ea8a3af..d84536db4 100644 --- a/patch/patches/compositor_1368.patch +++ b/patch/patches/compositor_1368.patch @@ -1,5 +1,5 @@ diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc -index 20fa23379c4b..87d8ba911d53 100644 +index 511d805187b1..5fb01fee0378 100644 --- content/browser/compositor/gpu_process_transport_factory.cc +++ content/browser/compositor/gpu_process_transport_factory.cc @@ -494,10 +494,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( @@ -26,7 +26,7 @@ index 20fa23379c4b..87d8ba911d53 100644 } else { DCHECK(context_provider); diff --git ui/compositor/compositor.h ui/compositor/compositor.h -index fccba71bf856..85e305a783b9 100644 +index e0ec33400b17..34fb1c987189 100644 --- ui/compositor/compositor.h +++ ui/compositor/compositor.h @@ -24,6 +24,7 @@ @@ -37,7 +37,7 @@ index fccba71bf856..85e305a783b9 100644 #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkMatrix44.h" #include "ui/compositor/compositor_animation_observer.h" -@@ -193,6 +194,17 @@ class COMPOSITOR_EXPORT ContextFactory { +@@ -199,6 +200,17 @@ class COMPOSITOR_EXPORT ContextFactory { virtual bool SyncTokensRequiredForDisplayCompositor() = 0; }; @@ -55,7 +55,7 @@ index fccba71bf856..85e305a783b9 100644 // Compositor object to take care of GPU painting. // A Browser compositor object is responsible for generating the final // displayable form of pixels comprising a single widget's contents. It draws an -@@ -233,6 +245,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, +@@ -239,6 +251,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, // Schedules a redraw of the layer tree associated with this compositor. void ScheduleDraw(); @@ -65,7 +65,7 @@ index fccba71bf856..85e305a783b9 100644 // Sets the root of the layer tree drawn by this Compositor. The root layer // must have no parent. The compositor's root layer is reset if the root layer // is destroyed. NULL can be passed to reset the root layer, in which case the -@@ -455,6 +470,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, +@@ -461,6 +476,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, ui::ContextFactory* context_factory_; ui::ContextFactoryPrivate* context_factory_private_; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index d04b42c32..4597dfb62 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -94,10 +94,10 @@ index 201f23b9b422..4664c6b32c22 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 36b5e3bf6853..9303e53b9094 100644 +index 8e5af3e3b9c5..5517c7363590 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -842,8 +842,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactory( +@@ -843,8 +843,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactory( RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory( this, false /* is_navigation */, false /* is_download */, &default_factory_request); @@ -108,7 +108,7 @@ index 36b5e3bf6853..9303e53b9094 100644 if (g_create_network_factory_callback_for_test.Get().is_null()) { storage_partition->GetNetworkContext()->CreateURLLoaderFactory( std::move(default_factory_request), std::move(params)); -@@ -1672,6 +1672,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1673,6 +1673,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -116,7 +116,7 @@ index 36b5e3bf6853..9303e53b9094 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -4050,9 +4051,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -4069,9 +4070,9 @@ void RenderFrameHostImpl::CommitNavigation( // is used. Currently we have this here to make sure we have non-racy // situation (https://crbug.com/849929). DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService)); @@ -364,10 +364,10 @@ index 2f1f46075b27..94f300dfea5d 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 5413e28e7a5b..cf05bbccdea5 100644 +index f6adabc683c0..e54a9ca14f10 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3471,7 +3471,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3473,7 +3473,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -377,7 +377,7 @@ index 5413e28e7a5b..cf05bbccdea5 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -3836,6 +3837,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { +@@ -3838,6 +3839,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 3d2288ee4..0a51ed929 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -27,7 +27,7 @@ index 53c7404ef1f9..ac33df7cfe0e 100644 auto* browser_context = web_contents->GetBrowserContext(); StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context); diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 29386263f0db..11fa39c54d43 100644 +index 406302b6b760..5ab2f3d7157b 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc @@ -928,10 +928,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( diff --git a/patch/patches/linux_build.patch b/patch/patches/linux_build.patch index 8cb2f11ec..72f7a3c85 100644 --- a/patch/patches/linux_build.patch +++ b/patch/patches/linux_build.patch @@ -12,10 +12,10 @@ index 959a59231746..67335e852219 100644 } diff --git chrome/browser/ui/libgtkui/gtk_util.cc chrome/browser/ui/libgtkui/gtk_util.cc -index 96f8c0e71472..49c462b37e12 100644 +index 39bf49c7b111..ad7b054e185f 100644 --- chrome/browser/ui/libgtkui/gtk_util.cc +++ chrome/browser/ui/libgtkui/gtk_util.cc -@@ -237,6 +237,7 @@ float GetDeviceScaleFactor() { +@@ -239,6 +239,7 @@ float GetDeviceScaleFactor() { return linux_ui ? linux_ui->GetDeviceScaleFactor() : 1; } @@ -23,7 +23,7 @@ index 96f8c0e71472..49c462b37e12 100644 using GtkSetState = void (*)(GtkWidgetPath*, gint, GtkStateFlags); PROTECTED_MEMORY_SECTION base::ProtectedMemory _gtk_widget_path_iter_set_state; -@@ -244,6 +245,7 @@ PROTECTED_MEMORY_SECTION base::ProtectedMemory +@@ -246,6 +247,7 @@ PROTECTED_MEMORY_SECTION base::ProtectedMemory using GtkSetObjectName = void (*)(GtkWidgetPath*, gint, const char*); PROTECTED_MEMORY_SECTION base::ProtectedMemory _gtk_widget_path_iter_set_object_name; @@ -31,7 +31,7 @@ index 96f8c0e71472..49c462b37e12 100644 } // namespace -@@ -401,10 +403,12 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context, +@@ -403,10 +405,12 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context, NOTREACHED(); } } else { @@ -44,7 +44,7 @@ index 96f8c0e71472..49c462b37e12 100644 switch (part_type) { case CSS_NAME: { if (GtkVersionCheck(3, 20)) { -@@ -449,6 +453,7 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context, +@@ -451,6 +455,7 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context, // widgets specially if they want to. gtk_widget_path_iter_add_class(path, -1, "chromium"); @@ -52,7 +52,7 @@ index 96f8c0e71472..49c462b37e12 100644 if (GtkVersionCheck(3, 14)) { static base::ProtectedMemory::Initializer init( &_gtk_widget_path_iter_set_state, -@@ -457,6 +462,7 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context, +@@ -459,6 +464,7 @@ ScopedStyleContext AppendCssNodeToStyleContext(GtkStyleContext* context, DCHECK(*_gtk_widget_path_iter_set_state); base::UnsanitizedCfiCall(_gtk_widget_path_iter_set_state)(path, -1, state); } diff --git a/patch/patches/message_loop.patch b/patch/patches/message_loop.patch index 983993d55..4c42e0768 100644 --- a/patch/patches/message_loop.patch +++ b/patch/patches/message_loop.patch @@ -1,8 +1,8 @@ diff --git base/message_loop/message_loop.cc base/message_loop/message_loop.cc -index 4571c726ec4a..ad1479647400 100644 +index 3723960a5c0c..fa924f020f4e 100644 --- base/message_loop/message_loop.cc +++ base/message_loop/message_loop.cc -@@ -573,6 +573,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) { +@@ -577,6 +577,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) { #endif } @@ -13,10 +13,10 @@ index 4571c726ec4a..ad1479647400 100644 MessageLoopCurrentForUI MessageLoopForUI::current() { return MessageLoopCurrentForUI::Get(); diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h -index 6010333616eb..f9479daaa4b8 100644 +index 7c31a128b53d..8d9dfdbc2a68 100644 --- base/message_loop/message_loop.h +++ base/message_loop/message_loop.h -@@ -343,6 +343,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, +@@ -351,6 +351,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, class BASE_EXPORT MessageLoopForUI : public MessageLoop { public: explicit MessageLoopForUI(Type type = TYPE_UI); diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 90f06f353..180df7449 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 b7b91a0751fa..3b6ce0f4ca09 100644 +index 4958a425d2bc..e685ce274504 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -901,6 +901,7 @@ split_static_library("ui") { diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 7846ecee1..c874d325f 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -296,10 +296,10 @@ index 3cfa0bde2bca..96da49496944 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 3887d68c6d22..629c16724145 100644 +index 45c9d093154a..f0b5346ca00c 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -739,11 +739,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, +@@ -733,11 +733,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, // Gets the correct render process to use for this SiteInstance. RenderProcessHost* GetProcessHost(SiteInstance* site_instance, bool is_for_guests_only) { @@ -315,7 +315,7 @@ index 3887d68c6d22..629c16724145 100644 // Is this the default storage partition? If it isn't, then just give it its // own non-shared process. -@@ -1341,7 +1340,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { +@@ -1335,7 +1334,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { // static RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( BrowserContext* browser_context, @@ -324,7 +324,7 @@ index 3887d68c6d22..629c16724145 100644 SiteInstance* site_instance, bool is_for_guests_only) { if (g_render_process_host_factory_) { -@@ -1350,8 +1349,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( +@@ -1344,8 +1343,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( } if (!storage_partition_impl) { @@ -335,7 +335,7 @@ index 3887d68c6d22..629c16724145 100644 } // If we've made a StoragePartition for guests (e.g., for the tag), // stash the Site URL on it. This way, when we start a service worker inside -@@ -1376,7 +1375,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = +@@ -1370,7 +1369,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, @@ -344,7 +344,7 @@ index 3887d68c6d22..629c16724145 100644 bool is_for_guests_only) : fast_shutdown_started_(false), deleting_soon_(false), -@@ -1409,10 +1408,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1403,10 +1402,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( indexed_db_factory_(new IndexedDBDispatcherHost( id_, storage_partition_impl_->GetURLRequestContext(), @@ -359,7 +359,7 @@ index 3887d68c6d22..629c16724145 100644 id_)), channel_connected_(false), sent_render_process_ready_(false), -@@ -1447,7 +1448,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1441,7 +1442,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( } push_messaging_manager_.reset(new PushMessagingManager( @@ -369,7 +369,7 @@ index 3887d68c6d22..629c16724145 100644 AddObserver(indexed_db_factory_.get()); AddObserver(service_worker_dispatcher_host_.get()); -@@ -1780,6 +1782,17 @@ void RenderProcessHostImpl::ResetChannelProxy() { +@@ -1774,6 +1776,17 @@ void RenderProcessHostImpl::ResetChannelProxy() { void RenderProcessHostImpl::CreateMessageFilters() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -387,7 +387,7 @@ index 3887d68c6d22..629c16724145 100644 MediaInternals* media_internals = MediaInternals::GetInstance(); // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages // from guests. -@@ -1792,7 +1805,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1786,7 +1799,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { base::MakeRefCounted( GetID(), GetBrowserContext(), request_context.get(), widget_helper_.get(), media_internals, @@ -396,7 +396,7 @@ index 3887d68c6d22..629c16724145 100644 AddFilter(render_message_filter.get()); render_frame_message_filter_ = new RenderFrameMessageFilter( -@@ -1819,10 +1832,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1813,10 +1826,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { ChromeBlobStorageContext::GetFor(browser_context); resource_message_filter_ = new ResourceMessageFilter( @@ -409,7 +409,7 @@ index 3887d68c6d22..629c16724145 100644 storage_partition_impl_->GetPrefetchURLLoaderService(), std::move(get_contexts_callback), BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); -@@ -1831,8 +1844,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1825,8 +1838,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter( new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); @@ -419,7 +419,7 @@ index 3887d68c6d22..629c16724145 100644 peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); AddFilter(peer_connection_tracker_host_.get()); -@@ -1854,10 +1866,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1848,10 +1860,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter(new TraceMessageFilter(GetID())); AddFilter(new ResolveProxyMsgHelper(request_context.get())); @@ -430,7 +430,7 @@ index 3887d68c6d22..629c16724145 100644 } void RenderProcessHostImpl::BindCacheStorage( -@@ -1869,7 +1877,8 @@ void RenderProcessHostImpl::BindCacheStorage( +@@ -1863,7 +1871,8 @@ void RenderProcessHostImpl::BindCacheStorage( cache_storage_dispatcher_host_ = base::MakeRefCounted(); cache_storage_dispatcher_host_->Init( @@ -440,7 +440,7 @@ index 3887d68c6d22..629c16724145 100644 } // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO // thread entirely. -@@ -2019,7 +2028,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2013,7 +2022,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &AppCacheDispatcherHost::Create, @@ -450,7 +450,7 @@ index 3887d68c6d22..629c16724145 100644 GetID())); AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create)); -@@ -2050,6 +2060,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2044,6 +2054,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { plugin_registry_.reset( new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); } diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index e33fdd411..3d190a8c6 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -73,7 +73,7 @@ index 8ed6ffd3a284..91db6f55c396 100644 void SynchronizeVisualProperties(); diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc -index 0f9d0a1c4269..cd9a314887cb 100644 +index 940d9c107664..f7a35655c757 100644 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -30,6 +30,10 @@ @@ -87,7 +87,7 @@ index 0f9d0a1c4269..cd9a314887cb 100644 #if defined(OS_WIN) #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/public/common/context_menu_params.h" -@@ -889,6 +893,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { +@@ -891,6 +895,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { ::SetFocus(hwnd); } } @@ -135,7 +135,7 @@ index f772f64d656e..7d13f9f81b6c 100644 return host ? host->GetAcceleratedWidget() : NULL; } diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index 9ec5fdb9bb5c..0694641f11db 100644 +index 9c6b588516f2..90e804d0cc68 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -87,6 +87,7 @@ DesktopWindowTreeHostWin::DesktopWindowTreeHostWin( @@ -160,7 +160,7 @@ index 9ec5fdb9bb5c..0694641f11db 100644 remove_standard_frame_ = params.remove_standard_frame; has_non_client_view_ = Widget::RequiresNonClientView(params.type); -@@ -871,11 +876,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() { +@@ -873,11 +878,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() { } void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) { @@ -427,10 +427,10 @@ index c7296fed234d..244d0034a1c4 100644 if (native_widget_delegate->IsDialogBox()) { *style |= DS_MODALFRAME; diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc -index 65ee52f582c9..b8f60b87ce21 100644 +index 4b7af541276d..8269cb4990f3 100644 --- ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc -@@ -2817,10 +2817,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, +@@ -2872,10 +2872,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, } else if (event.type() == ui::ET_MOUSEWHEEL) { ui::MouseWheelEvent mouse_wheel_event(msg); // Reroute the mouse wheel to the window under the pointer if applicable. diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index eda8e358c..eeb04eb8c 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,5 +1,5 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 7c9aa1a71876..05a554f999ba 100644 +index 26959103adcf..c7fba17fa97f 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4457,7 +4457,7 @@ Keep your key file in a safe place. You will need it to create new versions of y