diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 9bd389a5b..368a77a9a 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/119.0.6045.0' + 'chromium_checkout': 'refs/tags/119.0.6045.33', + 'depot_tools_checkout': '744bfd2a7b' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 8fbc403bb..dd760e84c 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 157ee5cadc0a7..9906a3cc24dd0 100644 +index 7cb8d3fc03da2..e643e73f80930 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -18,7 +18,7 @@ index 157ee5cadc0a7..9906a3cc24dd0 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2694,6 +2696,10 @@ static_library("browser") { +@@ -2696,6 +2698,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index e5bbf23a4..fd92b3f29 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644 return false; } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index eca90c39e0d44..2157b6d86ab02 100644 +index d5bc836ec888d..4da459c08e7af 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni") @@ -61,7 +61,7 @@ index eca90c39e0d44..2157b6d86ab02 100644 "views/apps/app_info_dialog/app_info_dialog_container.cc", "views/apps/app_info_dialog/app_info_dialog_container.h", "views/apps/app_info_dialog/app_info_dialog_views.cc", -@@ -6392,6 +6398,7 @@ static_library("ui") { +@@ -6393,6 +6399,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 130ffb028..cc1685f86 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -233,7 +233,7 @@ index a509d0b37e953..0d48c4a1f1daf 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 54053dfc9b86d..19c11cf71046d 100644 +index 9b845c0e331c4..6a2128ae2b562 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -42,6 +42,7 @@ @@ -295,7 +295,7 @@ index 54053dfc9b86d..19c11cf71046d 100644 } std::vector -@@ -7652,10 +7664,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7653,10 +7665,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -308,7 +308,7 @@ index 54053dfc9b86d..19c11cf71046d 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7674,7 +7686,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7675,7 +7687,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -318,7 +318,7 @@ index 54053dfc9b86d..19c11cf71046d 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7816,7 +7829,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7817,7 +7830,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index a288c23f3..c191038b2 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -12,10 +12,10 @@ index 34cacda8ef225..e0465b8ac1185 100644 version.Set("V8-Version", V8_VERSION_STRING); std::string host = info.GetHeaderValue("host"); diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index 3b58e4f2de295..e0348501c83d8 100644 +index 1aa2cfcabd6e9..61f6a8e228286 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -774,6 +774,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() { +@@ -753,6 +753,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() { resource_request_->has_user_gesture, initiating_origin, initiator_document_.AsRenderFrameHostIfValid(), &loader_factory); @@ -145,7 +145,7 @@ index 3c3ebfeec280e..b239506a39b43 100644 base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index cddb519c4c893..68b5fc0f60d9c 100644 +index 4ed1a50637e40..ce57912529596 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc @@ -941,6 +941,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index d39db3184..668b7c50e 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -41,10 +41,10 @@ index afefe3cd83dee..6668463247644 100644 } // namespace content diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index 7a99c04fcf5bb..2ed7d26f2d047 100644 +index d7b85d4a6adbe..6bd3035c313b3 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc -@@ -3261,6 +3261,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { +@@ -3271,6 +3271,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE); } diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index f7a95a1f0..dad2bb40b 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -21,7 +21,7 @@ index 0a6c1f498b8fc..79e0cf27a7715 100644 // If the corresponding Connector policy isn't set, don't perform scans. if (!service || !service->IsConnectorEnabled(connector)) diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index 1200475275e91..d32195f01c7ed 100644 +index 2d4683b149ed0..761a2216aaf63 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -22,6 +22,7 @@ @@ -45,7 +45,7 @@ index 1200475275e91..d32195f01c7ed 100644 DisableQuicIfNotAllowed(); -@@ -480,6 +483,9 @@ void ProfileNetworkContextService::OnTruncatedCookieBlockingChanged() { +@@ -490,6 +493,9 @@ void ProfileNetworkContextService::OnTruncatedCookieBlockingChanged() { void ProfileNetworkContextService::OnFirstPartySetsEnabledChanged( bool enabled) { @@ -55,7 +55,7 @@ index 1200475275e91..d32195f01c7ed 100644 // Update all FPS Access Delegates on the FPS service to be `enabled`. first_party_sets::FirstPartySetsPolicyServiceFactory::GetForBrowserContext( profile_) -@@ -866,9 +872,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -879,9 +885,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); @@ -83,7 +83,7 @@ index 1200475275e91..d32195f01c7ed 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -877,15 +900,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -890,15 +913,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( local_state->GetFilePath(prefs::kDiskCacheDir); if (!disk_cache_dir.empty()) base_cache_path = disk_cache_dir.Append(base_cache_path.BaseName()); @@ -103,7 +103,7 @@ index 1200475275e91..d32195f01c7ed 100644 network_context_params->file_paths->data_directory = path.Append(chrome::kNetworkDataDirname); network_context_params->file_paths->unsandboxed_data_path = path; -@@ -1038,6 +1060,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1051,6 +1073,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->block_trust_tokens = anti_abuse_content_setting == CONTENT_SETTING_BLOCK; @@ -111,7 +111,7 @@ index 1200475275e91..d32195f01c7ed 100644 network_context_params->first_party_sets_access_delegate_params = network::mojom::FirstPartySetsAccessDelegateParams::New(); network_context_params->first_party_sets_access_delegate_params->enabled = -@@ -1054,6 +1077,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1067,6 +1090,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( GetForBrowserContext(profile_); DCHECK(fps_service); fps_service->AddRemoteAccessDelegate(std::move(fps_access_delegate_remote)); @@ -223,7 +223,7 @@ index 61fd008fc067e..73909be088278 100644 // reset to null. const CookieAccessDelegate* cookie_access_delegate() const { diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc -index 6c804ec1092af..605ff3b32b0b8 100644 +index b43998a09b981..6249ece59ae77 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -297,14 +297,9 @@ void CookieManager::AllowFileSchemeCookies(