diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index fba8bdac5..fa1ee1669 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/104.0.5112.20', + 'chromium_checkout': 'refs/tags/104.0.5112.29', 'depot_tools_checkout': '350d210871' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index cdab35f05..bf7777ad7 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 f4f1725e5a0ed..59ce489a635c3 100644 +index 910034be7d7a9..1e96d3d20c57a 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -10,7 +10,7 @@ index f4f1725e5a0ed..59ce489a635c3 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -1946,6 +1947,7 @@ static_library("browser") { +@@ -1948,6 +1949,7 @@ static_library("browser") { "//build:chromeos_buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index f4f1725e5a0ed..59ce489a635c3 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2482,6 +2484,10 @@ static_library("browser") { +@@ -2486,6 +2488,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 2a1ec6f68..6bc5321eb 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 95a75d011f33e..cc5dc818152f8 100644 +index 8209af14c838d..98278b94328f1 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -301,6 +301,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -55,7 +55,7 @@ index 95a75d011f33e..cc5dc818152f8 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -2902,6 +2927,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -2913,6 +2938,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 87cbbe1c9..3629c9237 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -125,10 +125,10 @@ index 8b72897491669..546919dd70afc 100644 // that the X-Frame-Options protection mechanism is set to either DENY or // SAMEORIGIN. diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index d2110910a9a31..0b7f12ca2af62 100644 +index 207bc78a7adf7..c24e76d48d05c 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -941,6 +941,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -946,6 +946,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( if ((status == chrome::mojom::PluginStatus::kUnauthorized || status == chrome::mojom::PluginStatus::kBlocked) && @@ -136,7 +136,7 @@ index d2110910a9a31..0b7f12ca2af62 100644 content_settings_agent_delegate->IsPluginTemporarilyAllowed( identifier)) { status = chrome::mojom::PluginStatus::kAllowed; -@@ -1142,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1147,7 +1148,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( render_frame->GetRemoteAssociatedInterfaces()->GetInterface( plugin_auth_host.BindNewEndpointAndPassReceiver()); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); @@ -146,7 +146,7 @@ index d2110910a9a31..0b7f12ca2af62 100644 break; } case chrome::mojom::PluginStatus::kBlocked: { -@@ -1151,7 +1153,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1156,7 +1158,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name)); placeholder->AllowLoading(); RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked")); @@ -156,7 +156,7 @@ index d2110910a9a31..0b7f12ca2af62 100644 break; } case chrome::mojom::PluginStatus::kBlockedByPolicy: { -@@ -1161,7 +1164,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1166,7 +1169,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( group_name)); RenderThread::Get()->RecordAction( UserMetricsAction("Plugin_BlockedByPolicy")); @@ -166,7 +166,7 @@ index d2110910a9a31..0b7f12ca2af62 100644 break; } case chrome::mojom::PluginStatus::kBlockedNoLoading: { -@@ -1169,7 +1173,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1174,7 +1178,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, group_name)); diff --git a/patch/patches/chrome_renderer.patch b/patch/patches/chrome_renderer.patch index ff98a905c..ac284aea8 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 80183431d6cdb..19b76bf53cbf2 100644 +index bd01239dcaecb..d598891ee9cd0 100644 --- chrome/renderer/BUILD.gn +++ chrome/renderer/BUILD.gn @@ -5,6 +5,7 @@ @@ -10,7 +10,7 @@ index 80183431d6cdb..19b76bf53cbf2 100644 import("//chrome/common/features.gni") import("//components/nacl/features.gni") import("//components/offline_pages/buildflags/features.gni") -@@ -120,6 +121,7 @@ static_library("renderer") { +@@ -122,6 +123,7 @@ static_library("renderer") { deps = [ "//base/allocator:buildflags", "//build:chromeos_buildflags", @@ -18,7 +18,7 @@ index 80183431d6cdb..19b76bf53cbf2 100644 "//chrome:resources", "//chrome:strings", "//chrome/common", -@@ -210,6 +212,10 @@ static_library("renderer") { +@@ -217,6 +219,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 3eaf761ad..d1870715d 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -172,7 +172,7 @@ index 341458a637857..441708d4a301f 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 16341698899d7..37abd9d118002 100644 +index 53f79904e486b..bbfc8f1267ea5 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -30,6 +30,7 @@ @@ -234,7 +234,7 @@ index 16341698899d7..37abd9d118002 100644 } std::vector -@@ -6353,10 +6365,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -6352,10 +6364,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -247,7 +247,7 @@ index 16341698899d7..37abd9d118002 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -6375,7 +6387,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -6374,7 +6386,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -257,7 +257,7 @@ index 16341698899d7..37abd9d118002 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -6494,7 +6507,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -6493,7 +6506,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { diff --git a/patch/patches/embedder_product_override.patch b/patch/patches/embedder_product_override.patch index 626b3582c..b4e37ec7d 100644 --- a/patch/patches/embedder_product_override.patch +++ b/patch/patches/embedder_product_override.patch @@ -1,5 +1,5 @@ diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc -index acd60381a6294..f9be70d2da75f 100644 +index 5ceb4b3232d3e..6fc007e5a5589 100644 --- components/embedder_support/user_agent_utils.cc +++ components/embedder_support/user_agent_utils.cc @@ -15,6 +15,7 @@ diff --git a/patch/patches/message_pump_mac_2495.patch b/patch/patches/message_pump_mac_2495.patch index 970c356e4..54dfa6e2d 100644 --- a/patch/patches/message_pump_mac_2495.patch +++ b/patch/patches/message_pump_mac_2495.patch @@ -1,8 +1,8 @@ diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm -index 8ce36eaa64a86..b90c66c1c826c 100644 +index 1a7e0fa282a48..a56ac88cf5a98 100644 --- base/message_loop/message_pump_mac.mm +++ base/message_loop/message_pump_mac.mm -@@ -748,7 +748,8 @@ void MessagePumpUIApplication::Detach() { +@@ -759,7 +759,8 @@ void MessagePumpUIApplication::Detach() { #else ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { @@ -12,7 +12,7 @@ index 8ce36eaa64a86..b90c66c1c826c 100644 DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask()); // Pumping events in private runloop modes is known to interact badly with // app modal windows like NSAlert. -@@ -758,7 +759,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { +@@ -769,7 +770,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { } ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() { diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 02439c0f7..612ec0344 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -243,7 +243,7 @@ index e6842b0848c74..d214247587d41 100644 base::WeakPtrFactory weak_factory_{this}; }; diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -index 0ff9b8f6becc8..73e62450a9e03 100644 +index ff670d8099968..f39fd6972e304 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -260,8 +260,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {