diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 2cb717249..2fb3ce0a2 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/109.0.5414.8', + 'chromium_checkout': 'refs/tags/109.0.5414.36', 'depot_tools_checkout': 'ca3ebf119e' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index ad41956a6..b710b3250 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 304a8d1891a98..13be431518cc4 100644 +index 7662d4fc550b9..6eba00f309953 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -39,6 +39,7 @@ import("//build/nocompile.gni") diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index d88423e43..77da84445 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 18c138c21a853..554e22458da45 100644 // TODO(wjmaclean): We should update the ProcessLock comparison API diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index cd1650e1e1ad0..6768097b3a271 100644 +index 2e83be38937d6..ad61e6d4571b0 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -6671,10 +6671,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -6685,10 +6685,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,7 +47,7 @@ index cd1650e1e1ad0..6768097b3a271 100644 } return origin_and_debug_info; -@@ -6704,6 +6716,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -6718,6 +6730,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( SandboxFlagsToCommit()); diff --git a/patch/patches/build.patch b/patch/patches/build.patch index 79df1760f..19363a063 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,8 +1,8 @@ diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn -index 3eede98ae4e1d..df81b6b75d9bc 100644 +index d72f810e7eeb1..13899c3cd3785 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn -@@ -1891,8 +1891,6 @@ config("thin_archive") { +@@ -1896,8 +1896,6 @@ config("thin_archive") { # confuses lldb. if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) { arflags = [ "-T" ] diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 1d59386e9..fa92c2236 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 579d2c1b3db06..6f1e7e69e8ada 100644 +index b0c78b2c69ee8..b2f0ea93d4c4a 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 579d2c1b3db06..6f1e7e69e8ada 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2536,6 +2538,10 @@ static_library("browser") { +@@ -2537,6 +2539,10 @@ static_library("browser") { ] } @@ -29,7 +29,7 @@ index 579d2c1b3db06..6f1e7e69e8ada 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -6377,8 +6383,6 @@ static_library("browser") { +@@ -6378,8 +6384,6 @@ static_library("browser") { sources += [ "enterprise/chrome_browser_main_extra_parts_enterprise.cc", "enterprise/chrome_browser_main_extra_parts_enterprise.h", diff --git a/patch/patches/chrome_browser_dialogs_widget.patch b/patch/patches/chrome_browser_dialogs_widget.patch index 7af15dcfd..e1ba0fbad 100644 --- a/patch/patches/chrome_browser_dialogs_widget.patch +++ b/patch/patches/chrome_browser_dialogs_widget.patch @@ -112,7 +112,7 @@ index 51ed6bcf6b540..9ae4737e0737e 100644 virtual gfx::Point GetDialogPosition(const gfx::Size& size) = 0; // Returns whether a dialog currently about to be shown should be activated. diff --git ui/views/window/dialog_delegate.cc ui/views/window/dialog_delegate.cc -index bc0a51138f2fd..1a8086c46e237 100644 +index 54cd17c85983d..c8c276169eaec 100644 --- ui/views/window/dialog_delegate.cc +++ ui/views/window/dialog_delegate.cc @@ -60,10 +60,12 @@ DialogDelegate::DialogDelegate() { @@ -187,7 +187,7 @@ index bc0a51138f2fd..1a8086c46e237 100644 // Web-modal (ui::MODAL_TYPE_CHILD) dialogs with parents are marked as child // widgets to prevent top-level window behavior (independent movement, etc). diff --git ui/views/window/dialog_delegate.h ui/views/window/dialog_delegate.h -index 84430f84e9bdc..c229bb1155c02 100644 +index 09f95e99a53f1..e799ecc96b246 100644 --- ui/views/window/dialog_delegate.h +++ ui/views/window/dialog_delegate.h @@ -94,13 +94,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate { diff --git a/patch/patches/chrome_browser_permission_prompt.patch b/patch/patches/chrome_browser_permission_prompt.patch index e689af43b..34f129636 100644 --- a/patch/patches/chrome_browser_permission_prompt.patch +++ b/patch/patches/chrome_browser_permission_prompt.patch @@ -141,10 +141,10 @@ index fbce13c16ad10..0512b2f09937e 100644 std::unique_ptr CreatePermissionPrompt( content::WebContents* web_contents, diff --git chrome/browser/ui/views/permissions/permission_prompt_factory.cc chrome/browser/ui/views/permissions/permission_prompt_factory.cc -index 18923a76ceea2..368b82a6c4151 100644 +index 82a50b7e22dfe..c4ba55ec6bd54 100644 --- chrome/browser/ui/views/permissions/permission_prompt_factory.cc +++ chrome/browser/ui/views/permissions/permission_prompt_factory.cc -@@ -150,11 +150,28 @@ std::unique_ptr CreateQuietPrompt( +@@ -158,11 +158,28 @@ std::unique_ptr CreateQuietPrompt( } } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index b266c20da..531321fb7 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -198,7 +198,7 @@ index d12abb3451882..b14d4406c2a76 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index e0e8374bb5e74..bbafee080af8c 100644 +index 64aab0dd3ceb6..e86a6394ec8ff 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -35,6 +35,7 @@ @@ -230,7 +230,7 @@ index e0e8374bb5e74..bbafee080af8c 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -4149,9 +4157,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4180,9 +4188,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -242,7 +242,7 @@ index e0e8374bb5e74..bbafee080af8c 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -5960,7 +5970,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -5991,7 +6001,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( network_service); } @@ -251,7 +251,7 @@ index e0e8374bb5e74..bbafee080af8c 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -5978,6 +5988,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6009,6 +6019,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -260,7 +260,7 @@ index e0e8374bb5e74..bbafee080af8c 100644 } std::vector -@@ -6822,10 +6834,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -6853,10 +6865,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -273,7 +273,7 @@ index e0e8374bb5e74..bbafee080af8c 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -6844,7 +6856,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -6875,7 +6887,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -283,7 +283,7 @@ index e0e8374bb5e74..bbafee080af8c 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -6980,7 +6993,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7011,7 +7024,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 1a119a8f4..9d4feb4c9 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -155,7 +155,7 @@ index c5a340b64e36d..99a9f387dbd77 100644 trust_token_store_ = std::make_unique(); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index d57c6f1e7f41e..baea0d5edcb8c 100644 +index 288b47f5bbdf0..2e209c8511f52 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -340,6 +340,9 @@ struct NetworkContextParams { diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 9f2e86f26..4942ae79d 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index c8655d9270b81..d11450d22123a 100644 // Cancels and hides the current popup (datetime, select...) if any. virtual void CancelPagePopup() = 0; diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index eaa633bc51909..afc38da9459a9 100644 +index 82531576331b9..588695265ae28 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -249,8 +249,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {