diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 3c9157697..d6196f443 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/102.0.5005.0' + 'chromium_checkout': 'refs/tags/102.0.5005.22', + 'depot_tools_checkout': '583ca66091' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 8d6e78fac..d3141fe4d 100644 --- a/patch/patches/base_sandbox_2743.patch +++ b/patch/patches/base_sandbox_2743.patch @@ -1,5 +1,5 @@ diff --git base/BUILD.gn base/BUILD.gn -index 243c3e81d2b23..36fd2a888ac63 100644 +index 32d8f8db42fa9..058125ba320e9 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -37,6 +37,7 @@ import("//build/nocompile.gni") @@ -10,7 +10,7 @@ index 243c3e81d2b23..36fd2a888ac63 100644 import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") -@@ -1892,7 +1893,11 @@ mixed_component("base") { +@@ -1895,7 +1896,11 @@ mixed_component("base") { "hash/md5_constexpr_internal.h", "hash/sha1.h", ] @@ -23,7 +23,7 @@ index 243c3e81d2b23..36fd2a888ac63 100644 sources += [ "hash/md5_nacl.cc", "hash/md5_nacl.h", -@@ -2037,6 +2042,12 @@ mixed_component("base") { +@@ -2040,6 +2045,12 @@ mixed_component("base") { defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 0b3508a43..ee4b3906b 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 cf5f4ae70be68..6f18da19bbef3 100644 +index 86bbdc45c6911..4dd1198c0a532 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 9cc2b433b..f47732d9c 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -52,7 +52,7 @@ index 1027b8a325ac6..40500f1cd3886 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index 300971408c60f..bdb5343d9057d 100644 +index 7548e63c57dc8..208710225c03d 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -263,6 +263,25 @@ @@ -238,7 +238,7 @@ index 300971408c60f..bdb5343d9057d 100644 } content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( -@@ -1925,11 +2020,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -1930,11 +2025,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -254,7 +254,7 @@ index 300971408c60f..bdb5343d9057d 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2642,13 +2741,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -2647,13 +2746,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -276,7 +276,7 @@ index 300971408c60f..bdb5343d9057d 100644 return window_ ? window_->GetStatusBubble() : nullptr; } -@@ -2775,6 +2881,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -2780,6 +2886,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { content_translate_driver->RemoveTranslationObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 81f51a366..0a4911567 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -170,7 +170,7 @@ index dbd8f7ebe071d..b0f8d3d7bcff9 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 8c14a2053f595..740692cf04b87 100644 +index 3943c32ab29e7..9c5ed5bf61ea4 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -29,6 +29,7 @@ @@ -202,7 +202,7 @@ index 8c14a2053f595..740692cf04b87 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -3733,9 +3741,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -3734,9 +3742,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -214,7 +214,7 @@ index 8c14a2053f595..740692cf04b87 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -5373,7 +5383,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -5374,7 +5384,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( network_service); } @@ -223,7 +223,7 @@ index 8c14a2053f595..740692cf04b87 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -5391,6 +5401,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -5392,6 +5402,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -232,7 +232,7 @@ index 8c14a2053f595..740692cf04b87 100644 } std::vector -@@ -6262,10 +6274,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -6263,10 +6275,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -245,7 +245,7 @@ index 8c14a2053f595..740692cf04b87 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -6284,7 +6296,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -6285,7 +6297,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -255,7 +255,7 @@ index 8c14a2053f595..740692cf04b87 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -6392,7 +6405,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -6393,7 +6406,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/crashpad_tp_1995.patch b/patch/patches/crashpad_tp_1995.patch index 57d671d4f..c386cf6b4 100644 --- a/patch/patches/crashpad_tp_1995.patch +++ b/patch/patches/crashpad_tp_1995.patch @@ -40,10 +40,10 @@ index f121a2b07cdbd..b2e9bedac39d3 100644 virtual ~PruneCondition() {} diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc -index 8fe578f92f3a3..9acab9404c885 100644 +index eef24f71495fd..d3a273d369097 100644 --- third_party/crashpad/crashpad/client/settings.cc +++ third_party/crashpad/crashpad/client/settings.cc -@@ -111,7 +111,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { +@@ -116,7 +116,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { struct Settings::Data { static constexpr uint32_t kSettingsMagic = 'CPds'; @@ -52,7 +52,7 @@ index 8fe578f92f3a3..9acab9404c885 100644 enum Options : uint32_t { kUploadsEnabled = 1 << 0, -@@ -122,6 +122,9 @@ struct Settings::Data { +@@ -127,6 +127,9 @@ struct Settings::Data { options(0), padding_0(0), last_upload_attempt_time(0), @@ -62,7 +62,7 @@ index 8fe578f92f3a3..9acab9404c885 100644 client_id() {} uint32_t magic; -@@ -129,6 +132,9 @@ struct Settings::Data { +@@ -134,6 +137,9 @@ struct Settings::Data { uint32_t options; uint32_t padding_0; int64_t last_upload_attempt_time; // time_t @@ -72,7 +72,7 @@ index 8fe578f92f3a3..9acab9404c885 100644 UUID client_id; }; -@@ -212,6 +218,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) { +@@ -217,6 +223,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) { return WriteSettings(handle.get(), settings); } @@ -130,7 +130,7 @@ index 8fe578f92f3a3..9acab9404c885 100644 Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( FileHandle file, diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h -index aedf30cd874f7..ab798f00e0862 100644 +index 8ad8a2b16f648..adaede06e8b86 100644 --- third_party/crashpad/crashpad/client/settings.h +++ third_party/crashpad/crashpad/client/settings.h @@ -120,6 +120,11 @@ class Settings { diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 3c6dfacc4..6ff7e3976 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -449,12 +449,12 @@ index b7c7474fb5910..ce3e14071f0c6 100644 void WillHideMenu(MenuItemView* menu) override; void OnMenuClosed(MenuItemView* menu) override; diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc -index 25d368664566d..870bf405c6c80 100644 +index 5294a0aa9b177..23f46f2f1fd6c 100644 --- ui/views/controls/menu/menu_scroll_view_container.cc +++ ui/views/controls/menu/menu_scroll_view_container.cc -@@ -252,6 +252,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) - scroll_down_button_ = background_view_->AddChildView( - std::make_unique(content_view, false)); +@@ -235,6 +235,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) + scroll_down_button_ = + AddChildView(std::make_unique(content_view, false)); + SkColor override_color; + MenuDelegate* delegate = content_view_->GetMenuItem()->GetDelegate(); diff --git a/patch/patches/win_sandbox_3210.patch b/patch/patches/win_sandbox_3210.patch index 6dddad99a..b51304c81 100644 --- a/patch/patches/win_sandbox_3210.patch +++ b/patch/patches/win_sandbox_3210.patch @@ -1,8 +1,8 @@ diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc -index 8339cb51e2d2a..2d5282732e86a 100644 +index e4e7cfe65b87e..a669c90fd8937 100644 --- sandbox/policy/win/sandbox_win.cc +++ sandbox/policy/win/sandbox_win.cc -@@ -1133,6 +1133,13 @@ ResultCode SandboxWin::StartSandboxedProcess( +@@ -1134,6 +1134,13 @@ ResultCode SandboxWin::StartSandboxedProcess( const base::HandlesToInheritVector& handles_to_inherit, SandboxDelegate* delegate, base::Process* process) {