From 0e1d6c6906c34ec0eae0b80d3a259a5ba2c6ceeb Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 26 Dec 2018 22:42:26 +0200 Subject: [PATCH] Update to Chromium version 72.0.3626.28 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patches/browser_child_frame_2507.patch | 8 +-- patch/patches/chrome_browser.patch | 4 +- patch/patches/content_2015.patch | 16 ++--- patch/patches/external_textures_1006.patch | 2 +- patch/patches/linux_gtk_2014.patch | 8 +-- patch/patches/prefs_content_1161.patch | 8 +-- .../print_header_footer_1478_1565.patch | 2 +- patch/patches/storage_partition_1973.patch | 60 +++++++++---------- patch/patches/views_1749_2102.patch | 4 +- patch/patches/web_contents_1257_1565.patch | 12 ++-- patch/patches/webkit_plugin_info_2015.patch | 4 +- patch/patches/webview_plugin_2020.patch | 2 +- 13 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index df4f81183..aec193bfd 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/72.0.3626.0', + 'chromium_checkout': 'refs/tags/72.0.3626.28', } diff --git a/patch/patches/browser_child_frame_2507.patch b/patch/patches/browser_child_frame_2507.patch index c333a9448..f1e77cd8f 100644 --- a/patch/patches/browser_child_frame_2507.patch +++ b/patch/patches/browser_child_frame_2507.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_child_frame.cc content/browser/renderer_host/render_widget_host_view_child_frame.cc -index 97c7697726d4..aa1bbc28cf54 100644 +index ab1f2d3dacca..df2dff420e32 100644 --- content/browser/renderer_host/render_widget_host_view_child_frame.cc +++ content/browser/renderer_host/render_widget_host_view_child_frame.cc -@@ -633,6 +633,7 @@ void RenderWidgetHostViewChildFrame::SubmitCompositorFrame( +@@ -641,6 +641,7 @@ void RenderWidgetHostViewChildFrame::SubmitCompositorFrame( "RenderWidgetHostViewChildFrame::OnSwapCompositorFrame"); support_->SubmitCompositorFrame(local_surface_id, std::move(frame), std::move(hit_test_region_list)); @@ -10,7 +10,7 @@ index 97c7697726d4..aa1bbc28cf54 100644 } void RenderWidgetHostViewChildFrame::OnDidNotProduceFrame( -@@ -641,6 +642,15 @@ void RenderWidgetHostViewChildFrame::OnDidNotProduceFrame( +@@ -649,6 +650,15 @@ void RenderWidgetHostViewChildFrame::OnDidNotProduceFrame( support_->DidNotProduceFrame(ack); } @@ -26,7 +26,7 @@ index 97c7697726d4..aa1bbc28cf54 100644 void RenderWidgetHostViewChildFrame::TransformPointToRootSurface( gfx::PointF* point) { // This function is called by RenderWidgetHostInputEventRouter only for -@@ -826,6 +836,11 @@ void RenderWidgetHostViewChildFrame::ShowDefinitionForSelection() { +@@ -834,6 +844,11 @@ void RenderWidgetHostViewChildFrame::ShowDefinitionForSelection() { void RenderWidgetHostViewChildFrame::SpeakSelection() {} #endif // defined(OS_MACOSX) diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index c484549a9..19fd3e09d 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 e0fd47a70c7b..d56e7a6b8bec 100644 +index 08572d5b14f9..e4124d00fa83 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -29,7 +29,7 @@ index e0fd47a70c7b..d56e7a6b8bec 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -3629,7 +3635,7 @@ jumbo_split_static_library("browser") { +@@ -3636,7 +3642,7 @@ jumbo_split_static_library("browser") { ] } diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index ba37d1929..d2b8bacf3 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -81,10 +81,10 @@ index b8e933d665cf..ef41dae49b39 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 cd6c8652cd4f..5477372abb7e 100644 +index 80f1a635ff52..3b8f65dddd74 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -1998,6 +1998,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1999,6 +1999,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -92,7 +92,7 @@ index cd6c8652cd4f..5477372abb7e 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -4604,9 +4605,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -4606,9 +4607,9 @@ void RenderFrameHostImpl::CommitNavigation( DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) || base::FeatureList::IsEnabled( blink::features::kServiceWorkerServicification)); @@ -105,10 +105,10 @@ index cd6c8652cd4f..5477372abb7e 100644 FROM_HERE, {BrowserThread::IO}, base::BindOnce(&PrefetchURLLoaderService::GetFactory, diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc -index 324ed2f8b851..8170ac190ea5 100644 +index 541ce8cfca70..fce9bc74a3ad 100644 --- content/browser/frame_host/render_frame_message_filter.cc +++ content/browser/frame_host/render_frame_message_filter.cc -@@ -658,6 +658,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, +@@ -680,6 +680,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, void RenderFrameMessageFilter::OnGetPluginInfo( int render_frame_id, const GURL& url, @@ -116,7 +116,7 @@ index 324ed2f8b851..8170ac190ea5 100644 const url::Origin& main_frame_origin, const std::string& mime_type, bool* found, -@@ -666,8 +667,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( +@@ -691,8 +692,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( bool allow_wildcard = true; *found = plugin_service_->GetPluginInfo( render_process_id_, render_frame_id, resource_context_, url, @@ -128,10 +128,10 @@ index 324ed2f8b851..8170ac190ea5 100644 void RenderFrameMessageFilter::OnOpenChannelToPepperPlugin( diff --git content/browser/frame_host/render_frame_message_filter.h content/browser/frame_host/render_frame_message_filter.h -index 91a7d32dbe78..f99bc501c8b1 100644 +index 8280d104a6d9..ba3a682fdcee 100644 --- content/browser/frame_host/render_frame_message_filter.h +++ content/browser/frame_host/render_frame_message_filter.h -@@ -146,6 +146,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter +@@ -149,6 +149,7 @@ class CONTENT_EXPORT RenderFrameMessageFilter #if BUILDFLAG(ENABLE_PLUGINS) void OnGetPluginInfo(int render_frame_id, const GURL& url, diff --git a/patch/patches/external_textures_1006.patch b/patch/patches/external_textures_1006.patch index ef319795f..53273007c 100644 --- a/patch/patches/external_textures_1006.patch +++ b/patch/patches/external_textures_1006.patch @@ -989,7 +989,7 @@ index 73f1cd7a60af..2bde69b3842b 100644 "buffer_manager.cc", "buffer_manager.h", diff --git gpu/command_buffer/service/gles2_cmd_decoder.cc gpu/command_buffer/service/gles2_cmd_decoder.cc -index e4be47a76448..4949935c2241 100644 +index 4ebebc0ffb74..a99b3065c251 100644 --- gpu/command_buffer/service/gles2_cmd_decoder.cc +++ gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -34,6 +34,7 @@ diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index 901526c51..ea87ebf70 100644 --- a/patch/patches/linux_gtk_2014.patch +++ b/patch/patches/linux_gtk_2014.patch @@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn -index 96a7dc9c5be9..12318f88f99d 100644 +index 388633d91746..38177eb10165 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -3905,7 +3905,7 @@ test("unit_tests") { +@@ -3908,7 +3908,7 @@ test("unit_tests") { "../browser/ui/input_method/input_method_engine_unittest.cc", ] } @@ -80,7 +80,7 @@ index 96a7dc9c5be9..12318f88f99d 100644 sources += [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ] deps += [ "//build/config/linux/gtk" ] -@@ -3926,7 +3926,7 @@ test("unit_tests") { +@@ -3929,7 +3929,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -89,7 +89,7 @@ index 96a7dc9c5be9..12318f88f99d 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -4911,7 +4911,7 @@ if (!is_android) { +@@ -4914,7 +4914,7 @@ if (!is_android) { # suites, it seems like one or another starts timing out too. "../browser/ui/views/keyboard_access_browsertest.cc", ] diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index fca493fb6..3b6c75180 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,5 +1,5 @@ diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h -index 7772eb5cff36..909382b8e896 100644 +index 1ebd5ba221f6..03ebb6daa6eb 100644 --- content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h @@ -188,6 +188,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -23,7 +23,7 @@ index e648532ff596..570861ca3306 100644 record_whole_document(false), save_previous_document_resources(SavePreviousDocumentResources::NEVER), diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h -index 40c92b166696..e59e73012b69 100644 +index 3a44d907096b..2ed43c383cd6 100644 --- content/public/common/web_preferences.h +++ content/public/common/web_preferences.h @@ -203,6 +203,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -35,10 +35,10 @@ index 40c92b166696..e59e73012b69 100644 bool record_whole_document; SavePreviousDocumentResources save_previous_document_resources; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 5e97250f926d..c68129d1c24e 100644 +index 7bf71ed5baaf..4f385c0d1284 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -1007,6 +1007,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, +@@ -1009,6 +1009,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, #endif WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available); diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 08a6f8077..8108a4d70 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 8e91c8afab3d..3805f5080227 100644 +index c57b1a02a1fc..098cf62ce195 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -370,6 +370,7 @@ jumbo_split_static_library("ui") { diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index cd822a52f..169862574 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -83,10 +83,10 @@ index f061eca7c86b..0fc07c9c4eb8 100644 partition->GetBluetoothAllowedDevicesMap(); return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin()); diff --git content/browser/browser_context.cc content/browser/browser_context.cc -index f37ebdb29896..03448e9fcec0 100644 +index d797e307f6b0..61375e809b9d 100644 --- content/browser/browser_context.cc +++ content/browser/browser_context.cc -@@ -208,11 +208,18 @@ StoragePartition* GetStoragePartitionFromConfig( +@@ -209,11 +209,18 @@ StoragePartition* GetStoragePartitionFromConfig( StoragePartitionImplMap* partition_map = GetStoragePartitionMap(browser_context); @@ -108,7 +108,7 @@ index f37ebdb29896..03448e9fcec0 100644 } void SaveSessionStateOnIOThread( -@@ -746,6 +753,11 @@ BrowserContext::BrowserContext() +@@ -756,6 +763,11 @@ BrowserContext::BrowserContext() new SharedCorsOriginAccessListImpl())); } @@ -171,7 +171,7 @@ index ec9ab86d0ca6..0fe5219f1e84 100644 base::WeakPtrFactory weak_factory_; diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc -index a2d4e5187819..c61088e48747 100644 +index c771efab4ae1..d07321aba204 100644 --- content/browser/download/download_manager_impl.cc +++ content/browser/download/download_manager_impl.cc @@ -99,9 +99,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) { @@ -224,7 +224,7 @@ index a2d4e5187819..c61088e48747 100644 GetStoragePartition(browser_context_, render_process_id, render_frame_id); in_progress_manager_->InterceptDownloadFromNavigation( std::move(resource_request), render_process_id, render_frame_id, site_url, -@@ -1246,10 +1245,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( +@@ -1247,10 +1246,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( base::MakeRefCounted( rfh, params->url()); } else if (rfh && params->url().SchemeIsFileSystem()) { @@ -237,7 +237,7 @@ index a2d4e5187819..c61088e48747 100644 std::string storage_domain; auto* site_instance = rfh->GetSiteInstance(); if (site_instance) { -@@ -1264,10 +1261,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( +@@ -1265,10 +1262,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( params->url(), rfh, /*is_navigation=*/false, storage_partition->GetFileSystemContext(), storage_domain); } else { @@ -251,10 +251,10 @@ index a2d4e5187819..c61088e48747 100644 CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true); } diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index 686e303e0230..e458b78fdf7a 100644 +index cb7dca2aceae..57419f9b0f16 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -376,7 +376,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory { +@@ -386,7 +386,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory { std::unique_ptr CreateNetworkFactoryInfoWithHeaderClient( network::mojom::TrustedURLLoaderHeaderClientPtrInfo header_client, @@ -263,7 +263,7 @@ index 686e303e0230..e458b78fdf7a 100644 DCHECK_CURRENTLY_ON(BrowserThread::UI); network::mojom::URLLoaderFactoryPtrInfo factory_info; network::mojom::URLLoaderFactoryParamsPtr params = -@@ -1239,7 +1239,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController +@@ -1248,7 +1248,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController // path does as well for navigations. bool has_plugin = PluginService::GetInstance()->GetPluginInfo( -1 /* render_process_id */, -1 /* render_frame_id */, resource_context_, @@ -272,7 +272,7 @@ index 686e303e0230..e458b78fdf7a 100644 false /* allow_wildcard */, &stale, &plugin, nullptr); if (stale) { -@@ -1607,7 +1607,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( +@@ -1616,7 +1616,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( CreateResourceRequest(request_info.get(), frame_tree_node_id, IsNavigationDownloadAllowed(download_policy_)); @@ -328,10 +328,10 @@ index d821dc59609c..58ff1bc59fed 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index d1823ebdeee9..4c80df77e27f 100644 +index b5146d9180c9..00a620135bba 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -749,11 +749,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, +@@ -750,11 +750,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) { @@ -347,7 +347,7 @@ index d1823ebdeee9..4c80df77e27f 100644 // Is this the default storage partition? If it isn't, then just give it its // own non-shared process. -@@ -1499,7 +1498,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { +@@ -1500,7 +1499,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { // static RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( BrowserContext* browser_context, @@ -356,7 +356,7 @@ index d1823ebdeee9..4c80df77e27f 100644 SiteInstance* site_instance, bool is_for_guests_only) { if (g_render_process_host_factory_) { -@@ -1508,8 +1507,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( +@@ -1509,8 +1508,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( } if (!storage_partition_impl) { @@ -367,7 +367,7 @@ index d1823ebdeee9..4c80df77e27f 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 -@@ -1534,7 +1533,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = +@@ -1535,7 +1534,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, @@ -376,7 +376,7 @@ index d1823ebdeee9..4c80df77e27f 100644 bool is_for_guests_only) : fast_shutdown_started_(false), deleting_soon_(false), -@@ -1585,10 +1584,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1586,10 +1585,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( permission_service_context_(new PermissionServiceContext(this)), indexed_db_factory_(new IndexedDBDispatcherHost( id_, @@ -391,7 +391,7 @@ index d1823ebdeee9..4c80df77e27f 100644 id_)), channel_connected_(false), sent_render_process_ready_(false), -@@ -1621,7 +1622,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1622,7 +1623,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( } push_messaging_manager_.reset(new PushMessagingManager( @@ -401,7 +401,7 @@ index d1823ebdeee9..4c80df77e27f 100644 AddObserver(indexed_db_factory_.get()); AddObserver(service_worker_dispatcher_host_.get()); -@@ -1950,6 +1952,15 @@ void RenderProcessHostImpl::ResetChannelProxy() { +@@ -1947,6 +1949,15 @@ void RenderProcessHostImpl::ResetChannelProxy() { void RenderProcessHostImpl::CreateMessageFilters() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -417,7 +417,7 @@ index d1823ebdeee9..4c80df77e27f 100644 MediaInternals* media_internals = MediaInternals::GetInstance(); // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages // from guests. -@@ -1989,10 +2000,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1986,10 +1997,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { media_request_context)); resource_message_filter_ = new ResourceMessageFilter( @@ -430,7 +430,7 @@ index d1823ebdeee9..4c80df77e27f 100644 storage_partition_impl_->GetPrefetchURLLoaderService(), BrowserContext::GetSharedCorsOriginAccessList(browser_context), std::move(get_contexts_callback), -@@ -2001,8 +2012,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1998,8 +2009,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter(resource_message_filter_.get()); } @@ -440,7 +440,7 @@ index d1823ebdeee9..4c80df77e27f 100644 peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); AddFilter(peer_connection_tracker_host_.get()); -@@ -2019,10 +2029,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -2016,10 +2026,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter(new TraceMessageFilter(GetID())); AddFilter(new ResolveProxyMsgHelper(GetID())); @@ -451,7 +451,7 @@ index d1823ebdeee9..4c80df77e27f 100644 } void RenderProcessHostImpl::BindCacheStorage( -@@ -2034,7 +2040,8 @@ void RenderProcessHostImpl::BindCacheStorage( +@@ -2031,7 +2037,8 @@ void RenderProcessHostImpl::BindCacheStorage( cache_storage_dispatcher_host_ = base::MakeRefCounted(); cache_storage_dispatcher_host_->Init( @@ -461,7 +461,7 @@ index d1823ebdeee9..4c80df77e27f 100644 } // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO // thread entirely. -@@ -2218,7 +2225,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2215,7 +2222,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &CodeCacheHostImpl::Create, GetID(), @@ -471,7 +471,7 @@ index d1823ebdeee9..4c80df77e27f 100644 base::RetainedRef( storage_partition_impl_->GetGeneratedCodeCacheContext()))); -@@ -2230,7 +2238,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2227,7 +2235,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &AppCacheDispatcherHost::Create, @@ -481,7 +481,7 @@ index d1823ebdeee9..4c80df77e27f 100644 GetID())); AddUIThreadInterface( -@@ -2283,6 +2292,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2280,6 +2289,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { plugin_registry_.reset( new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); } @@ -492,7 +492,7 @@ index d1823ebdeee9..4c80df77e27f 100644 &PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get()))); #endif diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h -index 8b2915483c25..86ba4fab4ee5 100644 +index d6f289210d57..ed8aea3e4148 100644 --- content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h @@ -98,7 +98,6 @@ class ServiceWorkerDispatcherHost; @@ -512,7 +512,7 @@ index 8b2915483c25..86ba4fab4ee5 100644 SiteInstance* site_instance, bool is_for_guests_only); -@@ -491,7 +490,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -492,7 +491,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Use CreateRenderProcessHost() instead of calling this constructor // directly. RenderProcessHostImpl(BrowserContext* browser_context, @@ -521,7 +521,7 @@ index 8b2915483c25..86ba4fab4ee5 100644 bool is_for_guests_only); // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected -@@ -746,10 +745,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -747,10 +746,10 @@ class CONTENT_EXPORT RenderProcessHostImpl // The globally-unique identifier for this RPH. const int id_; @@ -726,10 +726,10 @@ index 69e9a943310b..fabdba322870 100644 std::move(client), creation_context_type, blink::MessagePortChannel(std::move(message_port)), diff --git content/browser/worker_host/worker_script_fetch_initiator.cc content/browser/worker_host/worker_script_fetch_initiator.cc -index cf47bcfcecb0..a22dc17ed0c6 100644 +index 58d2e20c9738..a0823c27c688 100644 --- content/browser/worker_host/worker_script_fetch_initiator.cc +++ content/browser/worker_host/worker_script_fetch_initiator.cc -@@ -97,7 +97,7 @@ void WorkerScriptFetchInitiator::Start( +@@ -98,7 +98,7 @@ void WorkerScriptFetchInitiator::Start( base::BindOnce( &WorkerScriptFetchInitiator::CreateScriptLoaderOnIO, process_id, std::move(resource_request), diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index ec5d2397b..3984ad271 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -102,10 +102,10 @@ index 50eaca5b18eb..038d866fd8d1 100644 }; diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h -index 282d1136b02c..e70023d433a1 100644 +index f374839b019d..02b90ca5afb6 100644 --- ui/views/animation/ink_drop_host_view.h +++ ui/views/animation/ink_drop_host_view.h -@@ -116,6 +116,8 @@ class VIEWS_EXPORT InkDropHostView : public View { +@@ -115,6 +115,8 @@ class VIEWS_EXPORT InkDropHostView : public View { // them. void AnimateInkDrop(InkDropState state, const ui::LocatedEvent* event); diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 189cd4141..0addadce0 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 8d1eaa3e779c..2ccd1ac08b69 100644 +index b7fed5f660c7..13a4680e9fa9 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -1973,21 +1973,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1980,21 +1980,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 8d1eaa3e779c..2ccd1ac08b69 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2681,6 +2690,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2688,6 +2697,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -61,7 +61,7 @@ index 8d1eaa3e779c..2ccd1ac08b69 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2713,7 +2731,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2720,7 +2738,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 8d1eaa3e779c..2ccd1ac08b69 100644 } // Save the created window associated with the route so we can show it // later. -@@ -6157,7 +6175,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -6166,7 +6184,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view = @@ -122,7 +122,7 @@ index 060e2194d9ea..7a81678de3d4 100644 // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h -index b26e4ea873f6..d07e068233b2 100644 +index e37e9b8658ab..60be0cac0af9 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -54,10 +54,12 @@ class FileSelectListener; diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 293e51f81..c2dfd3a29 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,10 +44,10 @@ index 3dac1a5a6f61..4fff23e66f2c 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 2f30ff7b0c74..9299e580e113 100644 +index 72df3508f9ea..bb2835772bf2 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1307,7 +1307,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1311,7 +1311,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 93c567a6d..e81590fc7 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 1ee0b0b636ca..478f1ee0f12e 100644 +index 411b6e9df3a0..19af0aac003d 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4517,7 +4517,7 @@ Keep your key file in a safe place. You will need it to create new versions of y