diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 7e2d39684..bec62c36e 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/116.0.5845.0' + 'chromium_checkout': 'refs/tags/116.0.5845.10', + 'depot_tools_checkout': '70a4a17f44' } diff --git a/libcef/browser/native/cursor_util_aura.cc b/libcef/browser/native/cursor_util_aura.cc index b653f5fe3..894f7bdf8 100644 --- a/libcef/browser/native/cursor_util_aura.cc +++ b/libcef/browser/native/cursor_util_aura.cc @@ -90,7 +90,7 @@ scoped_refptr ToPlatformCursor( if (ui_cursor.type() == ui::mojom::CursorType::kCustom) { platform_cursor = ui::CursorFactory::GetInstance()->CreateImageCursor( ui::mojom::CursorType::kCustom, ui_cursor.custom_bitmap(), - ui_cursor.custom_hotspot()); + ui_cursor.custom_hotspot(), ui_cursor.image_scale_factor()); } else { cursor_loader.SetDisplay(GetDisplay(browser)); diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index f7cc65f60..dc4ba7add 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -99,7 +99,7 @@ index a3ee1846fcf77..13edaf1203d69 100644 return raw_otr_profile; } diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 92dec1c25477c..0723bdb6bc6ad 100644 +index 9eb766c7a5818..3a66b90b55dd6 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -389,7 +389,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -112,7 +112,7 @@ index 92dec1c25477c..0723bdb6bc6ad 100644 zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this, diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h -index 60c9fd19fe15b..2a3e317d9c240 100644 +index 9bb7cd968c95d..bf16634f7dfe8 100644 --- chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h @@ -130,7 +130,7 @@ class ProfileManager : public Profile::Delegate { diff --git a/patch/patches/chrome_renderer.patch b/patch/patches/chrome_renderer.patch index 8208a748b..408cca4da 100644 --- a/patch/patches/chrome_renderer.patch +++ b/patch/patches/chrome_renderer.patch @@ -1,5 +1,5 @@ diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn -index 75bb3119411d2..462fa070d07a8 100644 +index 128b30200772f..d9c407819aa6d 100644 --- chrome/renderer/BUILD.gn +++ chrome/renderer/BUILD.gn @@ -5,6 +5,7 @@ @@ -18,7 +18,7 @@ index 75bb3119411d2..462fa070d07a8 100644 "//chrome:resources", "//chrome:strings", "//chrome/common", -@@ -237,6 +239,10 @@ static_library("renderer") { +@@ -238,6 +240,10 @@ static_library("renderer") { configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 741c9b7e5..be1d6693b 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -233,7 +233,7 @@ index ad3976cb46454..b49f7467156ed 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 6c5105b963a03..7b326cbc9246c 100644 +index 67709dcb78e17..33efc8ca9766e 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -41,6 +41,7 @@ @@ -265,7 +265,7 @@ index 6c5105b963a03..7b326cbc9246c 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -4316,9 +4324,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4341,9 +4349,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -277,7 +277,7 @@ index 6c5105b963a03..7b326cbc9246c 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6335,7 +6345,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6360,7 +6370,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( #endif } @@ -286,7 +286,7 @@ index 6c5105b963a03..7b326cbc9246c 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6353,6 +6363,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6378,6 +6388,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -295,7 +295,7 @@ index 6c5105b963a03..7b326cbc9246c 100644 } std::vector -@@ -7377,10 +7389,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7402,10 +7414,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 6c5105b963a03..7b326cbc9246c 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7399,7 +7411,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7424,7 +7436,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -318,7 +318,7 @@ index 6c5105b963a03..7b326cbc9246c 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7535,7 +7548,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7560,7 +7573,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { @@ -328,7 +328,7 @@ index 6c5105b963a03..7b326cbc9246c 100644 base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired, weak_factory_.GetWeakPtr(), diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index 599083d73c876..c6c565291a8fe 100644 +index e162b2d33f7bd..864ffbffb9f0a 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -136,6 +136,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -340,7 +340,7 @@ index 599083d73c876..c6c565291a8fe 100644 // TODO(https://crbug.com/787567): This file is about calls from content/ out // to chrome/ to get values or notify about events, but both of these // functions are from chrome/ to chrome/ and don't involve content/ at all. -@@ -630,7 +632,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -634,7 +636,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { override; void OnNetworkServiceCreated( network::mojom::NetworkService* network_service) override; @@ -349,7 +349,7 @@ index 599083d73c876..c6c565291a8fe 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1049,7 +1051,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -1053,7 +1055,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 97a10aafb..736f433bd 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -34,10 +34,10 @@ index b8649b77e9a29..0d25d60e81b1a 100644 factory = base::MakeRefCounted( std::move(loader_factory)); diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index d9b45cc4c8277..6dfa6ed1a6500 100644 +index d7a8a6d628b79..9dd5a6f5992f4 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc -@@ -1006,7 +1006,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( +@@ -1013,7 +1013,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( void ContentBrowserClient::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) {} @@ -46,7 +46,7 @@ index d9b45cc4c8277..6dfa6ed1a6500 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1015,6 +1015,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( +@@ -1022,6 +1022,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( cert_verifier_creation_params) { network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = "en-us,en"; @@ -55,18 +55,18 @@ index d9b45cc4c8277..6dfa6ed1a6500 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index f750767092895..d19f046ed2846 100644 +index a558365d87cb4..77eef4cee5a2d 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -37,6 +37,7 @@ - #include "content/public/browser/login_delegate.h" +@@ -38,6 +38,7 @@ #include "content/public/browser/mojo_binder_policy_map.h" + #include "content/public/browser/privacy_sandbox_invoking_api.h" #include "content/public/browser/storage_partition_config.h" +#include "content/public/browser/web_contents.h" #include "content/public/common/alternative_error_page_override_info.mojom-forward.h" #include "content/public/common/page_visibility_state.h" #include "content/public/common/window_container_type.mojom-forward.h" -@@ -1868,7 +1869,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1876,7 +1877,7 @@ class CONTENT_EXPORT ContentBrowserClient { // // If |relative_partition_path| is the empty string, it means this needs to // create the default NetworkContext for the BrowserContext. @@ -75,7 +75,7 @@ index f750767092895..d19f046ed2846 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -2076,6 +2077,19 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2084,6 +2085,19 @@ class CONTENT_EXPORT ContentBrowserClient { RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory); @@ -95,7 +95,7 @@ index f750767092895..d19f046ed2846 100644 // Creates an OverlayWindow to be used for video or Picture-in-Picture. // This window will house the content shown when in Picture-in-Picture mode. // This will return a new OverlayWindow. -@@ -2132,6 +2146,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2140,6 +2154,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); diff --git a/patch/patches/views_1749_2102_3330.patch b/patch/patches/views_1749_2102_3330.patch index f0ca8345b..d125384b2 100644 --- a/patch/patches/views_1749_2102_3330.patch +++ b/patch/patches/views_1749_2102_3330.patch @@ -106,10 +106,10 @@ index 3c78525361ebf..c922dfe5019a3 100644 } // namespace gfx diff --git ui/views/animation/ink_drop_host.h ui/views/animation/ink_drop_host.h -index c1c0631071a11..aa2c01ebce43e 100644 +index 109522be316f2..25fb550337fb6 100644 --- ui/views/animation/ink_drop_host.h +++ ui/views/animation/ink_drop_host.h -@@ -194,6 +194,8 @@ class VIEWS_EXPORT InkDropHost { +@@ -189,6 +189,8 @@ class VIEWS_EXPORT InkDropHost { View* host_view() { return host_view_; } const View* host_view() const { return host_view_; }