From 84a2c2fa61f479b7ae7935403d513d74c9617e56 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 13 Mar 2019 16:01:01 -0400 Subject: [PATCH] Update to Chromium version 73.0.3683.75 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser/content_browser_client.cc | 5 ++- libcef/browser/content_browser_client.h | 1 + patch/patches/browser_plugin_guest_1565.patch | 2 +- patch/patches/content_2015.patch | 12 ++--- patch/patches/crashpad_1995.patch | 6 +-- patch/patches/extensions_1947.patch | 4 +- patch/patches/storage_partition_1973.patch | 44 +++++++++---------- 8 files changed, 39 insertions(+), 37 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index ed1d0c3b0..138b7bce8 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/73.0.3683.60' + 'chromium_checkout': 'refs/tags/73.0.3683.75' } diff --git a/libcef/browser/content_browser_client.cc b/libcef/browser/content_browser_client.cc index 597eb277f..41a32a3a6 100644 --- a/libcef/browser/content_browser_client.cc +++ b/libcef/browser/content_browser_client.cc @@ -1120,6 +1120,7 @@ bool CefContentBrowserClient::WillCreateURLLoaderFactory( content::RenderFrameHost* frame, int render_process_id, bool is_navigation, + bool is_download, const url::Origin& request_initiator, network::mojom::URLLoaderFactoryRequest* factory_request, network::mojom::TrustedURLLoaderHeaderClientPtrInfo* header_client, @@ -1131,8 +1132,8 @@ bool CefContentBrowserClient::WillCreateURLLoaderFactory( extensions::BrowserContextKeyedAPIFactory::Get( browser_context); bool use_proxy = web_request_api->MaybeProxyURLLoaderFactory( - browser_context, frame, render_process_id, is_navigation, factory_request, - header_client); + browser_context, frame, render_process_id, is_navigation, is_download, + factory_request, header_client); if (bypass_redirect_checks) *bypass_redirect_checks = use_proxy; return use_proxy; diff --git a/libcef/browser/content_browser_client.h b/libcef/browser/content_browser_client.h index e02f4df4c..1cd3e6855 100644 --- a/libcef/browser/content_browser_client.h +++ b/libcef/browser/content_browser_client.h @@ -147,6 +147,7 @@ class CefContentBrowserClient : public content::ContentBrowserClient { content::RenderFrameHost* frame, int render_process_id, bool is_navigation, + bool is_download, const url::Origin& request_initiator, network::mojom::URLLoaderFactoryRequest* factory_request, network::mojom::TrustedURLLoaderHeaderClientPtrInfo* header_client, diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index d49ae119c..b4ed7269d 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -221,7 +221,7 @@ index c0c553023138..39b8fe0bd57c 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 7f4308b56a14..d17b8b8ef44d 100644 +index 2ff03cf86f72..c7fed51cee68 100644 --- content/browser/web_contents/web_contents_view_mac.mm +++ content/browser/web_contents/web_contents_view_mac.mm @@ -312,7 +312,8 @@ void WebContentsViewMac::CreateView( diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index e90593f36..b2bf8dfb8 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -81,10 +81,10 @@ index 9381de48eafa..dfcdcb29feb5 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 75069cf3ad35..27657e669453 100644 +index 9727a15ac2b7..e0dc811e626c 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -2153,6 +2153,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -2175,6 +2175,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -92,7 +92,7 @@ index 75069cf3ad35..27657e669453 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -4850,9 +4851,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -4882,9 +4883,9 @@ void RenderFrameHostImpl::CommitNavigation( DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService) || base::FeatureList::IsEnabled( blink::features::kServiceWorkerServicification)); @@ -340,10 +340,10 @@ index 8136604d267a..be7fde2f1a38 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 5b45214bdb34..8d654d142309 100644 +index 73c2e6af3d98..de435a4a8b5f 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3689,7 +3689,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3700,7 +3700,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -353,7 +353,7 @@ index 5b45214bdb34..8d654d142309 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -4072,6 +4073,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { +@@ -4083,6 +4084,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 586998efa..27150d83d 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -241,7 +241,7 @@ index 9ee85554812c..7af55ddda8fe 100644 extern void InitCrashKeysForTesting(); diff --git components/crash/content/app/crash_reporter_client.cc components/crash/content/app/crash_reporter_client.cc -index b3b09cee8d6f..4bc2afc7bd6e 100644 +index c3c3f9db07d4..c532a5a46740 100644 --- components/crash/content/app/crash_reporter_client.cc +++ components/crash/content/app/crash_reporter_client.cc @@ -88,7 +88,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() { @@ -300,7 +300,7 @@ index b3b09cee8d6f..4bc2afc7bd6e 100644 +#endif + #if defined(OS_ANDROID) - unsigned int CrashReporterClient::GetCrashDumpPercentageForWebView() { + unsigned int CrashReporterClient::GetCrashDumpPercentage() { return 100; @@ -194,9 +222,11 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() { return false; @@ -318,7 +318,7 @@ index b3b09cee8d6f..4bc2afc7bd6e 100644 } // namespace crash_reporter diff --git components/crash/content/app/crash_reporter_client.h components/crash/content/app/crash_reporter_client.h -index caebf67a7e0f..5e7cf3d8c1a6 100644 +index 1d35caa36716..7b96fb687b98 100644 --- components/crash/content/app/crash_reporter_client.h +++ components/crash/content/app/crash_reporter_client.h @@ -5,7 +5,9 @@ diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 08aeea842..0fc2632bb 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -57,7 +57,7 @@ index f9f8e5204d1d..e35a65860293 100644 // If |new_instance| is a new SiteInstance for a subframe that requires a // dedicated process, set its process reuse policy so that such subframes are diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index eaa7d8b25141..7cdf8e39bc82 100644 +index b40ca1e3be82..94d435a821d9 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -452,6 +452,13 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -74,7 +74,7 @@ index eaa7d8b25141..7cdf8e39bc82 100644 // Returns true if the passed in URL should be assigned as the site of the // current SiteInstance, if it does not yet have a site. virtual bool ShouldAssignSiteForURL(const GURL& url); -@@ -1460,6 +1467,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1466,6 +1473,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct() const; diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 39abb4b25..f5fb015e5 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -171,10 +171,10 @@ 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 2d45e9e41f49..fabc2af20806 100644 +index a2cd3267d01a..8367940dc28e 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) { +@@ -102,9 +102,9 @@ void DeleteDownloadedFileOnUIThread(const base::FilePath& file_path) { } #endif @@ -187,7 +187,7 @@ index 2d45e9e41f49..fabc2af20806 100644 DCHECK_CURRENTLY_ON(BrowserThread::UI); SiteInstance* site_instance = nullptr; -@@ -111,8 +111,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context, +@@ -114,8 +114,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context, if (render_frame_host_) site_instance = render_frame_host_->GetSiteInstance(); } @@ -197,7 +197,7 @@ index 2d45e9e41f49..fabc2af20806 100644 } void OnDownloadStarted( -@@ -270,7 +269,7 @@ base::FilePath GetTemporaryDownloadDirectory() { +@@ -273,7 +272,7 @@ base::FilePath GetTemporaryDownloadDirectory() { #endif scoped_refptr @@ -206,16 +206,16 @@ index 2d45e9e41f49..fabc2af20806 100644 RenderFrameHost* rfh, bool is_download) { network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info; -@@ -287,7 +286,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition, - } +@@ -308,7 +307,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition, } + return base::MakeRefCounted( - storage_partition->url_loader_factory_getter(), + base::WrapRefCounted(storage_partition->url_loader_factory_getter()), std::move(proxy_factory_ptr_info), std::move(proxy_factory_request)); } -@@ -1198,7 +1197,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete( +@@ -1219,7 +1218,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete( tab_referrer_url = entry->GetReferrer().url; } } @@ -224,7 +224,7 @@ index 2d45e9e41f49..fabc2af20806 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, -@@ -1249,10 +1248,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( +@@ -1270,10 +1269,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( base::MakeRefCounted( rfh, params->url()); } else if (rfh && params->url().SchemeIsFileSystem()) { @@ -237,9 +237,9 @@ index 2d45e9e41f49..fabc2af20806 100644 std::string storage_domain; auto* site_instance = rfh->GetSiteInstance(); if (site_instance) { -@@ -1267,10 +1264,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( - params->url(), rfh, /*is_navigation=*/false, - storage_partition->GetFileSystemContext(), storage_domain); +@@ -1317,10 +1314,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( + std::move(wrapper_factory)); + } } else { - StoragePartitionImpl* storage_partition = - static_cast( @@ -251,10 +251,10 @@ index 2d45e9e41f49..fabc2af20806 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 eb08165b2708..149abb4b4e79 100644 +index 47c7fb628bb1..c7ce776ea49a 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -387,7 +387,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory { +@@ -376,7 +376,7 @@ class AboutURLLoaderFactory : public network::mojom::URLLoaderFactory { std::unique_ptr CreateNetworkFactoryInfoWithHeaderClient( network::mojom::TrustedURLLoaderHeaderClientPtrInfo header_client, @@ -263,7 +263,7 @@ index eb08165b2708..149abb4b4e79 100644 DCHECK_CURRENTLY_ON(BrowserThread::UI); network::mojom::URLLoaderFactoryPtrInfo factory_info; network::mojom::URLLoaderFactoryParamsPtr params = -@@ -1259,7 +1259,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 eb08165b2708..149abb4b4e79 100644 false /* allow_wildcard */, &stale, &plugin, nullptr); if (stale) { -@@ -1608,7 +1608,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( +@@ -1597,7 +1597,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( CreateResourceRequest(request_info.get(), frame_tree_node_id, IsNavigationDownloadAllowed(download_policy_)); @@ -328,7 +328,7 @@ 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 04f816a43b87..bd7c315d3a81 100644 +index 94d88268d6f5..4d2ebe964930 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -747,11 +747,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -461,7 +461,7 @@ index 04f816a43b87..bd7c315d3a81 100644 } // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO // thread entirely. -@@ -2269,7 +2276,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2273,7 +2280,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &CodeCacheHostImpl::Create, GetID(), @@ -471,7 +471,7 @@ index 04f816a43b87..bd7c315d3a81 100644 base::RetainedRef( storage_partition_impl_->GetGeneratedCodeCacheContext()))); -@@ -2281,7 +2289,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2285,7 +2293,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &AppCacheDispatcherHost::Create, @@ -481,7 +481,7 @@ index 04f816a43b87..bd7c315d3a81 100644 GetID())); AddUIThreadInterface( -@@ -2327,6 +2336,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2331,6 +2340,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { plugin_registry_.reset( new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); } @@ -492,7 +492,7 @@ index 04f816a43b87..bd7c315d3a81 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 1d6fb2e65926..f029c71de154 100644 +index 1e8f777be2e3..5ef3fa67d138 100644 --- content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h @@ -101,7 +101,6 @@ class ServiceWorkerDispatcherHost; @@ -512,7 +512,7 @@ index 1d6fb2e65926..f029c71de154 100644 SiteInstance* site_instance, bool is_for_guests_only); -@@ -518,7 +517,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -519,7 +518,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Use CreateRenderProcessHost() instead of calling this constructor // directly. RenderProcessHostImpl(BrowserContext* browser_context, @@ -521,7 +521,7 @@ index 1d6fb2e65926..f029c71de154 100644 bool is_for_guests_only); // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected -@@ -784,10 +783,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -785,10 +784,10 @@ class CONTENT_EXPORT RenderProcessHostImpl // The globally-unique identifier for this RPH. const int id_;