diff --git a/BUILD.gn b/BUILD.gn index 577a2f767..6726b8f0a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1366,7 +1366,6 @@ make_pack_header("resources") { "$root_gen_dir/third_party/blink/public/resources/grit/blink_resources.h", "$root_gen_dir/ui/resources/grit/ui_resources.h", "$root_gen_dir/ui/resources/grit/webui_generated_resources.h", - "$root_gen_dir/ui/resources/grit/webui_resources.h", "$root_gen_dir/ui/views/resources/grit/views_resources.h", ] @@ -1394,7 +1393,6 @@ make_pack_header("resources") { "//third_party/blink/public:resources", "//ui/resources:ui_resources_grd", "//ui/resources:webui_generated_resources_grd", - "//ui/resources:webui_resources_grd", "//ui/views/resources:resources_grd", ] } diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index d9e7bcf48..3c9157697 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/102.0.4997.0' + 'chromium_checkout': 'refs/tags/102.0.5005.0' } diff --git a/libcef/browser/frame_host_impl.cc b/libcef/browser/frame_host_impl.cc index cc6ea8580..0e74976a0 100644 --- a/libcef/browser/frame_host_impl.cc +++ b/libcef/browser/frame_host_impl.cc @@ -414,8 +414,10 @@ void CefFrameHostImpl::ExecuteJavaScriptWithUserGestureForTests( } content::RenderFrameHost* rfh = GetRenderFrameHost(); - if (rfh) - rfh->ExecuteJavaScriptWithUserGestureForTests(javascript); + if (rfh) { + rfh->ExecuteJavaScriptWithUserGestureForTests(javascript, + base::NullCallback()); + } } content::RenderFrameHost* CefFrameHostImpl::GetRenderFrameHost() const { diff --git a/libcef/browser/net_service/resource_request_handler_wrapper.cc b/libcef/browser/net_service/resource_request_handler_wrapper.cc index 1819f9ca0..8e0120dde 100644 --- a/libcef/browser/net_service/resource_request_handler_wrapper.cc +++ b/libcef/browser/net_service/resource_request_handler_wrapper.cc @@ -1339,7 +1339,7 @@ std::unique_ptr CreateInterceptedRequestHandler( content::RenderFrameHost* frame = nullptr; - if (request.is_main_frame || + if (request.is_outermost_main_frame || static_cast(request.resource_type) == blink::mojom::ResourceType::kMainFrame) { frame = web_contents->GetMainFrame(); diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.cc b/libcef/renderer/alloy/alloy_render_thread_observer.cc index dec93f226..f0a834ca8 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.cc +++ b/libcef/renderer/alloy/alloy_render_thread_observer.cc @@ -61,9 +61,6 @@ void AlloyRenderThreadObserver::SetConfiguration( *GetDynamicConfigParams() = std::move(*params); } -void AlloyRenderThreadObserver::SetContentSettingRules( - const RendererContentSettingRules& rules) {} - void AlloyRenderThreadObserver::OnRendererConfigurationAssociatedRequest( mojo::PendingAssociatedReceiver receiver) { diff --git a/libcef/renderer/alloy/alloy_render_thread_observer.h b/libcef/renderer/alloy/alloy_render_thread_observer.h index 747003a1a..909ac29c1 100644 --- a/libcef/renderer/alloy/alloy_render_thread_observer.h +++ b/libcef/renderer/alloy/alloy_render_thread_observer.h @@ -45,8 +45,6 @@ class AlloyRenderThreadObserver : public content::RenderThreadObserver, mojo::PendingRemote content_settings_manager) override; void SetConfiguration(chrome::mojom::DynamicParamsPtr params) override; - void SetContentSettingRules( - const RendererContentSettingRules& rules) override; void OnRendererConfigurationAssociatedRequest( mojo::PendingAssociatedReceiver diff --git a/patch/patch.cfg b/patch/patch.cfg index 99abd3bf7..1c5b2ffda 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -557,5 +557,10 @@ patches = [ # Fix xmlTextReaderReadOuterXml parsing error. # https://gitlab.gnome.org/GNOME/libxml2/-/issues/371 'name': 'libxml_371', + }, + { + # Windows: Fix cef_sandbox compile error in hang_watcher.cc. + # https://bugs.chromium.org/p/chromium/issues/detail?id=1310011#c10 + 'name': 'base_hang_watcher_1310011', } ] diff --git a/patch/patches/base_hang_watcher_1310011.patch b/patch/patches/base_hang_watcher_1310011.patch new file mode 100644 index 000000000..9cf8d7847 --- /dev/null +++ b/patch/patches/base_hang_watcher_1310011.patch @@ -0,0 +1,20 @@ +diff --git base/threading/hang_watcher.cc base/threading/hang_watcher.cc +index 5eff8563b1309..f62a711b57ca5 100644 +--- base/threading/hang_watcher.cc ++++ base/threading/hang_watcher.cc +@@ -719,6 +719,7 @@ void HangWatcher::WatchStateSnapShot::Init( + any_hung_thread_has_dumping_enabled = true; + } + ++#if BUILDFLAG(ENABLE_BASE_TRACING) + // Emit trace events for monitored threads. + if (ThreadTypeLoggingLevelGreaterOrEqual(watch_state.get()->thread_type(), + LoggingLevel::kUmaOnly)) { +@@ -728,6 +729,7 @@ void HangWatcher::WatchStateSnapShot::Init( + TRACE_EVENT_BEGIN("base", "HangWatcher::ThreadHung", track, deadline); + TRACE_EVENT_END("base", track, now); + } ++#endif + + // Attempt to mark the thread as needing to stay within its current + // WatchHangsInScope until capture is complete. diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index eddab0e35..8d6e78fac 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 15da9351b899b..a027749fce2ef 100644 +index 243c3e81d2b23..36fd2a888ac63 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -37,6 +37,7 @@ import("//build/nocompile.gni") @@ -10,7 +10,7 @@ index 15da9351b899b..a027749fce2ef 100644 import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") -@@ -1886,7 +1887,11 @@ mixed_component("base") { +@@ -1892,7 +1893,11 @@ mixed_component("base") { "hash/md5_constexpr_internal.h", "hash/sha1.h", ] @@ -23,7 +23,7 @@ index 15da9351b899b..a027749fce2ef 100644 sources += [ "hash/md5_nacl.cc", "hash/md5_nacl.h", -@@ -2030,6 +2035,12 @@ mixed_component("base") { +@@ -2037,6 +2042,12 @@ mixed_component("base") { defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ] } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 0f22768e0..c55b2d0c9 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index f5b91aa9fc965..65319cceb358c 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 c9dc13f15119a..ac34d086f26c0 100644 +index 06f3689531f53..393dd4e2f1db2 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -6120,6 +6120,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( +@@ -6189,6 +6189,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( network::mojom::WebSandboxFlags sandbox_flags) { // Calculate an approximation of the origin. The sandbox/csp are ignored. url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); @@ -36,7 +36,7 @@ index c9dc13f15119a..ac34d086f26c0 100644 // Apply sandbox flags. // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag -@@ -6153,6 +6159,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { +@@ -6222,6 +6228,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { if (IsSameDocument() || IsPageActivation()) return GetRenderFrameHost()->GetLastCommittedOrigin(); diff --git a/patch/patches/build.patch b/patch/patches/build.patch index b20ced542..9dd64181e 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 c411ee37ca205..d63ea867cb635 100644 +index d40843b44f9ee..e693fd557f9c1 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn -@@ -1839,8 +1839,6 @@ config("thin_archive") { +@@ -1840,8 +1840,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 15ab346ab..0b3508a43 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 5c126bf6ff139..d3af3a615e240 100644 +index cf5f4ae70be68..6f18da19bbef3 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index 5c126bf6ff139..d3af3a615e240 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -1939,6 +1940,7 @@ static_library("browser") { +@@ -1935,6 +1936,7 @@ static_library("browser") { "//build:chromeos_buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index 5c126bf6ff139..d3af3a615e240 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2601,6 +2603,10 @@ static_library("browser") { +@@ -2599,6 +2601,10 @@ static_library("browser") { deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ] } diff --git a/patch/patches/chrome_browser_background_mode_1100085.patch b/patch/patches/chrome_browser_background_mode_1100085.patch index 0623a8377..f3d263e51 100644 --- a/patch/patches/chrome_browser_background_mode_1100085.patch +++ b/patch/patches/chrome_browser_background_mode_1100085.patch @@ -14,10 +14,10 @@ index d7b9aa164f161..a042abaecbce7 100644 std::unique_ptr manager) = 0; #endif diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc -index 44e000fe1d3ea..1dc5893f5bd65 100644 +index 4591a0f22c94c..d4a6345cce8f7 100644 --- chrome/browser/browser_process_impl.cc +++ chrome/browser/browser_process_impl.cc -@@ -1003,18 +1003,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { +@@ -1004,18 +1004,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { return download_request_limiter_.get(); } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index deb3e2c4a..9cc2b433b 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index 9e534ff1683f1..de406f5879be0 100644 return false; } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index b26bef7fb2293..421f7b723bbc0 100644 +index 1027b8a325ac6..40500f1cd3886 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -10,6 +10,7 @@ import("//build/config/features.gni") @@ -24,7 +24,7 @@ index b26bef7fb2293..421f7b723bbc0 100644 import("//chrome/browser/buildflags.gni") import("//chrome/common/features.gni") import("//chromeos/assistant/assistant.gni") -@@ -359,6 +360,10 @@ static_library("ui") { +@@ -362,6 +363,10 @@ static_library("ui") { "//build/config/compiler:wexit_time_destructors", ] @@ -35,7 +35,7 @@ index b26bef7fb2293..421f7b723bbc0 100644 # Since browser and browser_ui actually depend on each other, # we must omit the dependency from browser_ui to browser. # However, this means browser_ui and browser should more or less -@@ -381,6 +386,7 @@ static_library("ui") { +@@ -384,6 +389,7 @@ static_library("ui") { "//build:branding_buildflags", "//build:chromeos_buildflags", "//cc/paint", @@ -43,7 +43,7 @@ index b26bef7fb2293..421f7b723bbc0 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -5342,6 +5348,7 @@ static_library("ui") { +@@ -5361,6 +5367,7 @@ static_library("ui") { if (enable_basic_printing) { deps += [ "//components/printing/browser", @@ -52,7 +52,7 @@ index b26bef7fb2293..421f7b723bbc0 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index 70ee9049e3cb7..97af3ddf51ecf 100644 +index 300971408c60f..bdb5343d9057d 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -263,6 +263,25 @@ diff --git a/patch/patches/chrome_browser_content_settings.patch b/patch/patches/chrome_browser_content_settings.patch index 3d7ab40f1..31305dea3 100644 --- a/patch/patches/chrome_browser_content_settings.patch +++ b/patch/patches/chrome_browser_content_settings.patch @@ -56,10 +56,10 @@ index 242f244a6d3b5..d037f2dfd9987 100644 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) SupervisedUserSettingsService* supervised_service = diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc -index 4ba853105dcd0..28a742fa327c8 100644 +index 3e0be5b6bc5ce..720d3bdc37d87 100644 --- components/content_settings/renderer/content_settings_agent_impl.cc +++ components/content_settings/renderer/content_settings_agent_impl.cc -@@ -164,7 +164,7 @@ ContentSetting GetContentSettingFromRulesImpl( +@@ -144,7 +144,7 @@ ContentSetting GetContentSettingFromRules( return rule.GetContentSetting(); } } @@ -67,4 +67,4 @@ index 4ba853105dcd0..28a742fa327c8 100644 + // NOTREACHED(); return CONTENT_SETTING_DEFAULT; } - + } // namespace diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index ad7faf53b..c0fd89d80 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 1687c8f965a49..95c31e8641311 100644 +index e6efbf1e457ae..0972890bab0f8 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -296,6 +296,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -69,7 +69,7 @@ index 1687c8f965a49..95c31e8641311 100644 RenderViewContextMenu::GetHandlersForLinkUrl() { custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers = diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h -index 16edbd2b396d2..36147131456e8 100644 +index 37e11f2cd6742..d1fadef23b3e3 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -124,6 +124,12 @@ class RenderViewContextMenu diff --git a/patch/patches/chrome_browser_dialogs.patch b/patch/patches/chrome_browser_dialogs.patch index 74eeb887c..a91517b77 100644 --- a/patch/patches/chrome_browser_dialogs.patch +++ b/patch/patches/chrome_browser_dialogs.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc -index 0145003ac8ad9..cf033c0afeccc 100644 +index 23215d8b854fd..4cc1e7f7d3d95 100644 --- chrome/browser/file_select_helper.cc +++ chrome/browser/file_select_helper.cc @@ -20,6 +20,7 @@ diff --git a/patch/patches/chrome_browser_profile_menu.patch b/patch/patches/chrome_browser_profile_menu.patch index 2f8e1006e..cbb2729b0 100644 --- a/patch/patches/chrome_browser_profile_menu.patch +++ b/patch/patches/chrome_browser_profile_menu.patch @@ -54,10 +54,10 @@ index 9c0ed63b74ca8..b9e7bcbcfd605 100644 chrome::RecordDialogCreation( diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc -index 1a6a648e63e31..dc1316b9fb227 100644 +index 056f30772779a..98e942f93634d 100644 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -512,7 +512,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode, +@@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode, ProfileMenuViewBase* bubble = nullptr; if (view_mode == profiles::BUBBLE_VIEW_MODE_INCOGNITO) { diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 58952dc7d..993bf0d58 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -85,7 +85,7 @@ index ca2561e412621..febd52df6c971 100644 virtual bool IsSignedIn() = 0; diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc -index a3d0830cebbca..3af475c216e63 100644 +index bf169b652ef30..b2bb98ceada7f 100644 --- chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc @@ -993,7 +993,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, @@ -100,7 +100,7 @@ index a3d0830cebbca..3af475c216e63 100644 return raw_otr_profile; } diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 026d2c91a4923..1a49c3c42e7ca 100644 +index 45389cca9b0ab..ab1573eaaf7a7 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -512,7 +512,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -113,7 +113,7 @@ index 026d2c91a4923..1a49c3c42e7ca 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 cc3c0dfb5be1b..89a35c2f914c4 100644 +index 8ba4e0ba9f3c0..d7b888f7120c4 100644 --- chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h @@ -151,7 +151,7 @@ class ProfileManager : public Profile::Delegate { @@ -135,7 +135,7 @@ index cc3c0dfb5be1b..89a35c2f914c4 100644 // Returns the directory where the first created profile is stored, // relative to the user data directory currently in use. diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc -index 290b0e3e352ea..6fa4420236c13 100644 +index 6ccdfa7f3cc46..f8668efcc77f6 100644 --- chrome/browser/profiles/renderer_updater.cc +++ chrome/browser/profiles/renderer_updater.cc @@ -8,6 +8,7 @@ @@ -146,7 +146,7 @@ index 290b0e3e352ea..6fa4420236c13 100644 #include "chrome/browser/content_settings/content_settings_manager_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" -@@ -85,8 +86,10 @@ RendererUpdater::RendererUpdater(Profile* profile) +@@ -35,8 +36,10 @@ RendererUpdater::RendererUpdater(Profile* profile) : profile_(profile), is_off_the_record_(profile_->IsOffTheRecord()), original_profile_(profile->GetOriginalProfile()) { diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 25af69377..88f9e432d 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 7a096b1c69de4..08a5142af028b 100644 +index abfb11349c9ee..10d7d16a48d56 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -931,6 +931,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -929,6 +929,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( if ((status == chrome::mojom::PluginStatus::kUnauthorized || status == chrome::mojom::PluginStatus::kBlocked) && @@ -136,7 +136,7 @@ index 7a096b1c69de4..08a5142af028b 100644 content_settings_agent_delegate->IsPluginTemporarilyAllowed( identifier)) { status = chrome::mojom::PluginStatus::kAllowed; -@@ -1132,7 +1133,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1130,7 +1131,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( render_frame->GetRemoteAssociatedInterfaces()->GetInterface( plugin_auth_host.BindNewEndpointAndPassReceiver()); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); @@ -146,7 +146,7 @@ index 7a096b1c69de4..08a5142af028b 100644 break; } case chrome::mojom::PluginStatus::kBlocked: { -@@ -1141,7 +1143,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1139,7 +1141,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 7a096b1c69de4..08a5142af028b 100644 break; } case chrome::mojom::PluginStatus::kBlockedByPolicy: { -@@ -1151,7 +1154,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1149,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( group_name)); RenderThread::Get()->RecordAction( UserMetricsAction("Plugin_BlockedByPolicy")); @@ -166,7 +166,7 @@ index 7a096b1c69de4..08a5142af028b 100644 break; } case chrome::mojom::PluginStatus::kBlockedNoLoading: { -@@ -1159,7 +1163,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1157,7 +1161,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, group_name)); diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 2dd65912b..81f51a366 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -132,7 +132,7 @@ index e07874dc5a2fa..e2e4f795e74a2 100644 GetMainRunLoopInstance()->QuitWhenIdleClosure()); } diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm -index 8bf722c61c059..ac755279227f2 100644 +index dbd8f7ebe071d..b0f8d3d7bcff9 100644 --- chrome/browser/chrome_browser_main_mac.mm +++ chrome/browser/chrome_browser_main_mac.mm @@ -16,6 +16,7 @@ @@ -143,7 +143,7 @@ index 8bf722c61c059..ac755279227f2 100644 #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/browser_process.h" -@@ -112,6 +113,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -110,6 +111,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { } } @@ -151,15 +151,15 @@ index 8bf722c61c059..ac755279227f2 100644 // Create the app delegate. This object is intentionally leaked as a global // singleton. It is accessed through -[NSApp delegate]. AppController* app_controller = [[AppController alloc] init]; -@@ -120,6 +122,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -118,6 +120,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { chrome::BuildMainMenu(NSApp, app_controller, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false); [app_controller mainMenuCreated]; +#endif // BUILDFLAG(ENABLE_CEF) - chrome::DeveloperIDCertificateReauthorizeInApp(); - chrome::PurgeStaleScreenCapturePermission(); -@@ -182,7 +185,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, + PrefService* local_state = g_browser_process->local_state(); + DCHECK(local_state); +@@ -177,7 +180,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, } void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { @@ -170,18 +170,18 @@ index 8bf722c61c059..ac755279227f2 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index f83e2e268deae..3ef9193ffa150 100644 +index 8c14a2053f595..740692cf04b87 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc -@@ -28,6 +28,7 @@ - #include "base/strings/stringprintf.h" +@@ -29,6 +29,7 @@ + #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/after_startup_task_utils.h" -@@ -1280,6 +1281,8 @@ bool IsTopChromeWebUIURL(const GURL& url) { +@@ -1281,6 +1282,8 @@ bool IsTopChromeWebUIURL(const GURL& url) { } // namespace ChromeContentBrowserClient::ChromeContentBrowserClient() { @@ -190,7 +190,7 @@ index f83e2e268deae..3ef9193ffa150 100644 #if BUILDFLAG(ENABLE_PLUGINS) extra_parts_.push_back(new ChromeContentBrowserClientPluginsPart); #endif -@@ -1305,6 +1308,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1306,6 +1309,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { extra_parts_.clear(); } @@ -202,7 +202,7 @@ index f83e2e268deae..3ef9193ffa150 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -3735,9 +3743,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -3733,9 +3741,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -265,10 +265,10 @@ index f83e2e268deae..3ef9193ffa150 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 41a5ddd24bbfc..9e70243361d4e 100644 +index f0415a5099cdf..b37813c8c43e0 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h -@@ -116,6 +116,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -117,6 +117,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { ~ChromeContentBrowserClient() override; @@ -277,7 +277,7 @@ index 41a5ddd24bbfc..9e70243361d4e 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. -@@ -557,7 +559,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -558,7 +560,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { override; void OnNetworkServiceCreated( network::mojom::NetworkService* network_service) override; @@ -286,7 +286,7 @@ index 41a5ddd24bbfc..9e70243361d4e 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -908,7 +910,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -910,7 +912,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; @@ -296,7 +296,7 @@ index 41a5ddd24bbfc..9e70243361d4e 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index be73964172416..eeb8f6511aace 100644 +index c2f47de7f3d15..ca406616ebeec 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -11,6 +11,7 @@ @@ -318,7 +318,7 @@ index be73964172416..eeb8f6511aace 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -1296,6 +1301,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1300,6 +1305,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, SessionDataService::RegisterProfilePrefs(registry); #endif diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 284ea6119..de9efeb33 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc -index e5daf6829b114..25fe7f09c8604 100644 +index 288cc6934c794..86593d1b2a74d 100644 --- chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc @@ -381,8 +381,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -28,7 +28,7 @@ index e5daf6829b114..25fe7f09c8604 100644 // The order of commands in this switch statement must match the function // declaration order in browser.h! switch (id) { -@@ -1027,11 +1036,13 @@ void BrowserCommandController::TabRestoreServiceLoaded( +@@ -1033,11 +1042,13 @@ void BrowserCommandController::TabRestoreServiceLoaded( // BrowserCommandController, private: bool BrowserCommandController::IsShowingMainUI() { @@ -466,7 +466,7 @@ index 7475765f4b514..25c59d942782b 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index 8dceab5d386ec..5d3063ac774cb 100644 +index 1ab19d8ef4493..c7fe972561440 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -172,12 +172,13 @@ auto& GetViewCommandMap() { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index a08e3f4aa..aa5d947a4 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -12,10 +12,10 @@ index fc87fd9a6ffca..99c6b27018e13 100644 GetContentClient()->browser()->GetUserAgent()); version.SetString("V8-Version", V8_VERSION_STRING); diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index 7a0e48df998df..017d915f6fe6b 100644 +index f24b5fa85e26d..dfca9fdb9aae0 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -673,6 +673,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( +@@ -681,6 +681,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( resource_request_->has_user_gesture, initiating_origin, initiator_document_.AsRenderFrameHostIfValid(), &loader_factory); @@ -34,7 +34,7 @@ index 7a0e48df998df..017d915f6fe6b 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 2a51c8c4d4cd2..e01e40175477f 100644 +index ffa24d4b67792..ee736fcd4ebeb 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -11,7 +11,7 @@ @@ -46,7 +46,7 @@ index 2a51c8c4d4cd2..e01e40175477f 100644 #include -@@ -894,7 +894,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( +@@ -895,7 +895,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( void ContentBrowserClient::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) {} @@ -55,7 +55,7 @@ index 2a51c8c4d4cd2..e01e40175477f 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -903,6 +903,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( +@@ -904,6 +904,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( cert_verifier_creation_params) { network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = "en-us,en"; @@ -64,10 +64,10 @@ index 2a51c8c4d4cd2..e01e40175477f 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index d6ad990189520..42540f27a98eb 100644 +index ae3dda4b9b40b..1eef127339151 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -32,6 +32,7 @@ +@@ -33,6 +33,7 @@ #include "content/public/browser/login_delegate.h" #include "content/public/browser/mojo_binder_policy_map.h" #include "content/public/browser/storage_partition_config.h" @@ -75,7 +75,7 @@ index d6ad990189520..42540f27a98eb 100644 #include "content/public/common/alternative_error_page_override_info.mojom-forward.h" #include "content/public/common/main_function_params.h" #include "content/public/common/page_visibility_state.h" -@@ -1663,7 +1664,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1664,7 +1665,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. @@ -84,7 +84,7 @@ index d6ad990189520..42540f27a98eb 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1870,6 +1871,19 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1871,6 +1872,19 @@ class CONTENT_EXPORT ContentBrowserClient { RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory); @@ -104,7 +104,7 @@ index d6ad990189520..42540f27a98eb 100644 // Creates an OverlayWindow to be used for video or document // Picture-in-Picture respectively. This window will house the content shown // when in Picture-in-Picture mode. This will return a new OverlayWindow. -@@ -1931,6 +1945,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1932,6 +1946,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); @@ -141,10 +141,10 @@ index eb8968c2a8610..143c3aaeda88e 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index 24b18a620f3e6..caa91a70894f3 100644 +index 15bada83dc4bc..c584f61e1ff7c 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc -@@ -655,6 +655,8 @@ void RenderThreadImpl::Init() { +@@ -656,6 +656,8 @@ void RenderThreadImpl::Init() { GetContentClient()->renderer()->CreateURLLoaderThrottleProvider( blink::URLLoaderThrottleProviderType::kFrame); @@ -154,10 +154,10 @@ index 24b18a620f3e6..caa91a70894f3 100644 &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index dbde0706007b8..ba34b8edfe561 100644 +index 340b9635325e3..d5d952722631c 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -1109,6 +1109,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { +@@ -1114,6 +1114,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { //------------------------------------------------------------------------------ @@ -174,10 +174,10 @@ index dbde0706007b8..ba34b8edfe561 100644 RendererBlinkPlatformImpl::GetCodeCacheHost() { base::AutoLock lock(code_cache_host_lock_); diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index e7d0d3e7c08c2..da82175f396ec 100644 +index 213b0b9c28974..616cbf555afe1 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -261,6 +261,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -262,6 +262,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { blink::WebVector* csp) override; base::PlatformThreadId GetIOThreadId() const override; diff --git a/patch/patches/crashpad_tp_1995.patch b/patch/patches/crashpad_tp_1995.patch index 8060f15c4..57d671d4f 100644 --- a/patch/patches/crashpad_tp_1995.patch +++ b/patch/patches/crashpad_tp_1995.patch @@ -1,8 +1,8 @@ diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc -index 492d466239d1a..a1df635870ede 100644 +index 3e92f06c8b3b4..74b4bf290dd0c 100644 --- third_party/crashpad/crashpad/client/prune_crash_reports.cc +++ third_party/crashpad/crashpad/client/prune_crash_reports.cc -@@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database, +@@ -75,13 +75,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database, } // static @@ -26,7 +26,7 @@ index 492d466239d1a..a1df635870ede 100644 static const time_t kSecondsInDay = 60 * 60 * 24; diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h -index b80cf7a59103b..6318dd05e6eef 100644 +index f121a2b07cdbd..b2e9bedac39d3 100644 --- third_party/crashpad/crashpad/client/prune_crash_reports.h +++ third_party/crashpad/crashpad/client/prune_crash_reports.h @@ -58,7 +58,8 @@ class PruneCondition { @@ -40,10 +40,10 @@ index b80cf7a59103b..6318dd05e6eef 100644 virtual ~PruneCondition() {} diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc -index 966481d6284e4..e0fa8394cb045 100644 +index 8fe578f92f3a3..9acab9404c885 100644 --- third_party/crashpad/crashpad/client/settings.cc +++ third_party/crashpad/crashpad/client/settings.cc -@@ -87,7 +87,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { +@@ -111,7 +111,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { struct Settings::Data { static constexpr uint32_t kSettingsMagic = 'CPds'; @@ -52,7 +52,7 @@ index 966481d6284e4..e0fa8394cb045 100644 enum Options : uint32_t { kUploadsEnabled = 1 << 0, -@@ -98,6 +98,9 @@ struct Settings::Data { +@@ -122,6 +122,9 @@ struct Settings::Data { options(0), padding_0(0), last_upload_attempt_time(0), @@ -62,7 +62,7 @@ index 966481d6284e4..e0fa8394cb045 100644 client_id() {} uint32_t magic; -@@ -105,6 +108,9 @@ struct Settings::Data { +@@ -129,6 +132,9 @@ struct Settings::Data { uint32_t options; uint32_t padding_0; int64_t last_upload_attempt_time; // time_t @@ -72,7 +72,7 @@ index 966481d6284e4..e0fa8394cb045 100644 UUID client_id; }; -@@ -188,6 +194,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) { +@@ -212,6 +218,56 @@ bool Settings::SetLastUploadAttemptTime(time_t time) { return WriteSettings(handle.get(), settings); } @@ -130,10 +130,10 @@ index 966481d6284e4..e0fa8394cb045 100644 Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( FileHandle file, diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h -index e476c60c3ba6b..ce8256c9f6d25 100644 +index aedf30cd874f7..ab798f00e0862 100644 --- third_party/crashpad/crashpad/client/settings.h +++ third_party/crashpad/crashpad/client/settings.h -@@ -116,6 +116,11 @@ class Settings { +@@ -120,6 +120,11 @@ class Settings { //! error logged. bool SetLastUploadAttemptTime(time_t time); @@ -184,7 +184,7 @@ index 0fe4760db7fe2..042af7247712c 100644 if (crashpad_is_win) { diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc -index efbeab7804c44..44fd31e58175c 100644 +index 138cf80026c98..d4af1f0c38d76 100644 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc @@ -269,6 +269,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 6dd50b5a0..4c52eec5c 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -12,7 +12,7 @@ index 5a11496a47ae7..76d199e4b69fa 100644 # https://crbug.com/474506. "//clank/java/BUILD.gn", diff --git BUILD.gn BUILD.gn -index 338241fc0f990..7a513198476e6 100644 +index 30774d5f7c134..823335857a8a4 100644 --- BUILD.gn +++ BUILD.gn @@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni") @@ -67,10 +67,10 @@ index 982fbe8d3f0d0..e757be4688f10 100644 + "studio path") } diff --git chrome/app/framework.order chrome/app/framework.order -index f8f71ef369c08..7a2ed5da7bda3 100644 +index 839144aa1e9bd..29c8ab32398a7 100644 --- chrome/app/framework.order +++ chrome/app/framework.order -@@ -31,3 +31,8 @@ _ChromeMain +@@ -28,3 +28,8 @@ _ChromeMain _lprofDirMode ___llvm_profile_filename ___llvm_profile_raw_version @@ -80,7 +80,7 @@ index f8f71ef369c08..7a2ed5da7bda3 100644 +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow + diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni -index dd4142e9596eb..4eee52e9b528e 100644 +index 628310385dd95..9cee3d3e4db78 100644 --- chrome/chrome_paks.gni +++ chrome/chrome_paks.gni @@ -5,6 +5,7 @@ diff --git a/patch/patches/gritsettings.patch b/patch/patches/gritsettings.patch index ea034fb12..84f787bac 100644 --- a/patch/patches/gritsettings.patch +++ b/patch/patches/gritsettings.patch @@ -1,5 +1,5 @@ diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec -index b036986b35dac..69f95510bb1fa 100644 +index 6a91282809a76..0be5e65854421 100644 --- tools/gritsettings/resource_ids.spec +++ tools/gritsettings/resource_ids.spec @@ -957,6 +957,15 @@ diff --git a/patch/patches/net_cookie_flags.patch b/patch/patches/net_cookie_flags.patch index d6b3eb272..c098f4a6f 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -24,7 +24,7 @@ index 2db8e1bc9e5bb..680db4669dfe7 100644 bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const { diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc -index 87868727a7822..a30035aeb00cc 100644 +index a15e3c4bed344..c665e98a1befc 100644 --- services/network/public/cpp/resource_request.cc +++ services/network/public/cpp/resource_request.cc @@ -264,7 +264,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const { diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index c1e0c3fd7..7c8bd4853 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -46,13 +46,13 @@ index d656ccabc3899..a4b7ce6a7dcd8 100644 #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/task_manager/web_contents_tags.h" diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc -index 3a3f733c45e08..c9a2d7672346a 100644 +index fb69efbfa8e35..060aad00efe18 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc -@@ -224,12 +224,12 @@ void UpdatePrintSettingsOnIO( +@@ -223,12 +223,12 @@ void UpdatePrintSettingsOnIO( mojom::PrintManagerHost::UpdatePrintSettingsCallback callback, scoped_refptr queue, - base::Value job_settings, + base::Value::Dict job_settings, - base::WeakPtr manager) { + base::WeakPtr manager, + const content::GlobalRenderFrameHostId& global_id) { @@ -65,15 +65,15 @@ index 3a3f733c45e08..c9a2d7672346a 100644 } auto* printer_query_ptr = printer_query.get(); printer_query_ptr->SetSettings( -@@ -680,6 +680,7 @@ void PrintViewManagerBase::UpdatePrintSettings( - job_settings.SetIntKey(kSettingRasterizePdfDpi, value); +@@ -694,6 +694,7 @@ void PrintViewManagerBase::UpdatePrintSettings( + job_settings.Set(kSettingRasterizePdfDpi, value); } + content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame(); auto callback_wrapper = base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply, weak_ptr_factory_.GetWeakPtr(), std::move(callback)); -@@ -687,7 +688,8 @@ void PrintViewManagerBase::UpdatePrintSettings( +@@ -701,7 +702,8 @@ void PrintViewManagerBase::UpdatePrintSettings( FROM_HERE, base::BindOnce(&UpdatePrintSettingsOnIO, cookie, std::move(callback_wrapper), queue_, @@ -84,10 +84,10 @@ index 3a3f733c45e08..c9a2d7672346a 100644 #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h -index 3a4cfa1e44d78..341d0f56a42b1 100644 +index 48895e0f8a846..699d9f0029c04 100644 --- chrome/browser/printing/print_view_manager_base.h +++ chrome/browser/printing/print_view_manager_base.h -@@ -160,9 +160,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { +@@ -184,9 +184,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { // Manages the low-level talk to the printer. scoped_refptr print_job_; @@ -136,7 +136,7 @@ index f6098966f5b34..da78289b66155 100644 } diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc -index 8574017c74653..0ca94f8d1da47 100644 +index 70a13e9c0c5e4..1eb0e9c8faa62 100644 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -22,6 +22,7 @@ @@ -161,7 +161,7 @@ index 8574017c74653..0ca94f8d1da47 100644 constexpr char kInvalidArgsForDidStartPreview[] = "Invalid arguments for DidStartPreview"; constexpr char kInvalidPageNumberForDidPreviewPage[] = -@@ -330,7 +338,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) { +@@ -326,7 +334,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) { source->AddLocalizedStrings(kLocalizedStrings); #if !BUILDFLAG(IS_CHROMEOS) diff --git a/patch/patches/printing_context_2196.patch b/patch/patches/printing_context_2196.patch index 6f568dac7..474cd3d35 100644 --- a/patch/patches/printing_context_2196.patch +++ b/patch/patches/printing_context_2196.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc -index f989f040cb9ff..7c618b0e274fc 100644 +index 86770178101d4..1b4b8cb69c413 100644 --- chrome/browser/printing/print_job_worker.cc +++ chrome/browser/printing/print_job_worker.cc @@ -131,6 +131,7 @@ PrintJobWorker::PrintJobWorker(content::GlobalRenderFrameHostId rfh_id) @@ -11,7 +11,7 @@ index f989f040cb9ff..7c618b0e274fc 100644 PrintJobWorker::~PrintJobWorker() { diff --git printing/printing_context.h printing/printing_context.h -index 3f36303105b79..aea7f788504d6 100644 +index 2c8ef23f7cb75..3a9d8e1e19234 100644 --- printing/printing_context.h +++ printing/printing_context.h @@ -172,6 +172,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { diff --git a/patch/patches/renderer_host_1070713.patch b/patch/patches/renderer_host_1070713.patch index b8526ebab..bd828a9ab 100644 --- a/patch/patches/renderer_host_1070713.patch +++ b/patch/patches/renderer_host_1070713.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc -index 32df5050f5a66..892e92c8e753b 100644 +index a9267b633e126..30f7f8b7803d3 100644 --- content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -657,6 +657,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const { +@@ -662,6 +662,8 @@ bool RenderViewHostImpl::IsRenderViewLiveForTesting() const { } void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index e3906d608..040cab191 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -101,10 +101,10 @@ index c143a7381df95..da14e2b0b1c81 100644 // reset to null. const CookieAccessDelegate* cookie_access_delegate() const { diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc -index 5780b295554fe..306e48ad0b84e 100644 +index c47a048291949..864c4e47ad4ca 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc -@@ -367,14 +367,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { +@@ -368,14 +368,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { void CookieManager::AllowFileSchemeCookies( bool allow, AllowFileSchemeCookiesCallback callback) { @@ -123,10 +123,10 @@ index 5780b295554fe..306e48ad0b84e 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index e9a56db142f5f..c2156d79c0855 100644 +index ecc38d1584570..de23f7b820cdf 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -2358,17 +2358,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2361,17 +2361,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index eec2218dd..7048ec7e7 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,5 +1,5 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index 46cb90ade1321..14e661aeec1d5 100644 +index 9faf869fcfb69..65c05bd8e3e88 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -494,10 +494,6 @@ class LoginHandlerDelegate { @@ -26,7 +26,7 @@ index 46cb90ade1321..14e661aeec1d5 100644 new LoginHandlerDelegate( std::move(auth_challenge_responder), std::move(web_contents_getter), auth_info, is_request_for_primary_main_frame, process_id, request_id, url, -@@ -2778,8 +2768,12 @@ void StoragePartitionImpl::GetQuotaSettings( +@@ -2777,8 +2767,12 @@ void StoragePartitionImpl::GetQuotaSettings( return; } @@ -40,7 +40,7 @@ index 46cb90ade1321..14e661aeec1d5 100644 storage::GetDefaultDeviceInfoHelper(), std::move(callback)); } -@@ -2789,9 +2783,12 @@ void StoragePartitionImpl::InitNetworkContext() { +@@ -2788,9 +2782,12 @@ void StoragePartitionImpl::InitNetworkContext() { cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params = cert_verifier::mojom::CertVerifierCreationParams::New(); diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 6ff7e3976..3c6dfacc4 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 5294a0aa9b177..23f46f2f1fd6c 100644 +index 25d368664566d..870bf405c6c80 100644 --- ui/views/controls/menu/menu_scroll_view_container.cc +++ ui/views/controls/menu/menu_scroll_view_container.cc -@@ -235,6 +235,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) - scroll_down_button_ = - AddChildView(std::make_unique(content_view, false)); +@@ -252,6 +252,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) + scroll_down_button_ = background_view_->AddChildView( + std::make_unique(content_view, false)); + SkColor override_color; + MenuDelegate* delegate = content_view_->GetMenuItem()->GetDelegate(); diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 980b10466..917265cd7 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -243,7 +243,7 @@ index 5858882a5e44f..46fe3237039d0 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 182a229085a31..989cb75588d95 100644 +index 3f64c46bf10b1..e72f66cd5a13c 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -216,8 +216,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) { @@ -309,7 +309,7 @@ index 444581249014a..5defa787d25cd 100644 // a reference. raw_ptr tooltip_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index c22fcb4edd5a7..a69c113eee3be 100644 +index b85a13cf4973b..3d1354723298c 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -338,7 +338,8 @@ void Widget::Init(InitParams params) { @@ -345,7 +345,7 @@ index c22fcb4edd5a7..a69c113eee3be 100644 } native_theme_observation_.Observe(GetNativeTheme()); -@@ -1435,10 +1444,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { +@@ -1436,10 +1445,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) { } gfx::Size Widget::GetMinimumSize() const { diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index b498f8c9f..a1647e73a 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index d0092176fd24a..a0d751db88136 100644 +index 335e70179a03e..e23bce70885b7 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -3057,6 +3057,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3061,6 +3061,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, site_instance.get(), params.renderer_initiated_creation, params.main_frame_name, GetOpener(), primary_main_frame_policy); @@ -15,7 +15,7 @@ index d0092176fd24a..a0d751db88136 100644 WebContentsViewDelegate* delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3067,6 +3073,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3071,6 +3077,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_.reset(CreateWebContentsView(this, delegate, &render_view_host_delegate_view_)); } @@ -23,7 +23,7 @@ index d0092176fd24a..a0d751db88136 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3245,6 +3252,9 @@ void WebContentsImpl::RenderWidgetCreated( +@@ -3249,6 +3256,9 @@ void WebContentsImpl::RenderWidgetCreated( OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", "render_widget_host", render_widget_host); created_widgets_.insert(render_widget_host); @@ -33,7 +33,7 @@ index d0092176fd24a..a0d751db88136 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -3933,6 +3943,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -3937,6 +3947,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( // objects. create_params.renderer_initiated_creation = !is_new_browsing_instance; @@ -49,7 +49,7 @@ index d0092176fd24a..a0d751db88136 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -7787,6 +7806,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -7791,6 +7810,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, // frames). SetFocusedFrameTree(node->frame_tree()); } @@ -88,7 +88,7 @@ index c062c66f596f5..8c9d5cd4d9af9 100644 // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h -index 85335ff06c87e..2c88f03d95d52 100644 +index 04aa4d993b331..59ed45848f201 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -57,9 +57,11 @@ class EyeDropperListener; diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 0ad753220..f0e3bb61f 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -1,8 +1,8 @@ diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h -index 0825226fae036..39fa28472f293 100644 +index 3ad783e681872..14f03dfb2fc96 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -868,6 +868,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -874,6 +874,11 @@ class BLINK_PLATFORM_EXPORT Platform { const WebURL& url, blink::WebVector* csp) {} @@ -15,7 +15,7 @@ index 0825226fae036..39fa28472f293 100644 static void InitializeMainThreadCommon(Platform* platform, std::unique_ptr main_thread); diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc -index 77f3044734030..26b66953a4ef6 100644 +index 9193ee3c1bf98..d196f780e044a 100644 --- third_party/blink/renderer/core/inspector/devtools_session.cc +++ third_party/blink/renderer/core/inspector/devtools_session.cc @@ -8,6 +8,7 @@ @@ -26,7 +26,7 @@ index 77f3044734030..26b66953a4ef6 100644 #include "third_party/blink/renderer/bindings/core/v8/script_controller.h" #include "third_party/blink/renderer/core/frame/local_frame.h" #include "third_party/blink/renderer/core/inspector/devtools_agent.h" -@@ -146,6 +147,7 @@ DevToolsSession::DevToolsSession( +@@ -147,6 +148,7 @@ DevToolsSession::DevToolsSession( for (wtf_size_t i = 0; i < agents_.size(); i++) agents_[i]->Restore(); } @@ -34,7 +34,7 @@ index 77f3044734030..26b66953a4ef6 100644 } DevToolsSession::~DevToolsSession() { -@@ -186,6 +188,7 @@ void DevToolsSession::Detach() { +@@ -187,6 +189,7 @@ void DevToolsSession::Detach() { agents_.clear(); v8_session_.reset(); agent_->client_->DebuggerTaskFinished(); diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 3d8d31c2a..435b9d0d8 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h -index a1427a6a95583..e159588700962 100644 +index 5e4032ccf916f..1ccf72b56fb22 100644 --- third_party/blink/public/web/web_view.h +++ third_party/blink/public/web/web_view.h @@ -336,6 +336,7 @@ class WebView { @@ -11,10 +11,10 @@ index a1427a6a95583..e159588700962 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 ef2be0e089921..fab6b9af53e60 100644 +index 6504c73f614be..ab03839d4efd3 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) { +@@ -248,8 +248,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { g_should_use_external_popup_menus = use_external_popup_menus; } @@ -30,7 +30,7 @@ index ef2be0e089921..fab6b9af53e60 100644 } namespace { -@@ -561,6 +566,7 @@ WebViewImpl::WebViewImpl( +@@ -560,6 +565,7 @@ WebViewImpl::WebViewImpl( chrome_client_(MakeGarbageCollected(this)), minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)), maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)), @@ -39,7 +39,7 @@ index ef2be0e089921..fab6b9af53e60 100644 fullscreen_controller_(std::make_unique(this)), page_base_background_color_( diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h -index 08a54c62b7f4e..1a5c2a27c8ef1 100644 +index 5c9609a6a8d1e..17700e40e6a5b 100644 --- third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h @@ -134,7 +134,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -52,7 +52,7 @@ index 08a54c62b7f4e..1a5c2a27c8ef1 100644 // Returns whether frames under this WebView are backed by a compositor. bool does_composite() const { return does_composite_; } -@@ -798,6 +799,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -799,6 +800,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, float fake_page_scale_animation_page_scale_factor_ = 0.f; bool fake_page_scale_animation_use_anchor_ = false; diff --git a/tools/gn_args.py b/tools/gn_args.py index cfd80cf64..be9672d2f 100644 --- a/tools/gn_args.py +++ b/tools/gn_args.py @@ -526,9 +526,7 @@ def LinuxSysrootExists(cpu): # CPU-specific sysroot directory names. # Should match the values in build/config/sysroot.gni. release = 'bullseye' - if cpu == 'x86': - sysroot_name = 'debian_%s_i386-sysroot' % release - elif cpu == 'x64': + if cpu == 'x64': sysroot_name = 'debian_%s_amd64-sysroot' % release elif cpu == 'arm': sysroot_name = 'debian_%s_arm-sysroot' % release @@ -562,7 +560,7 @@ def GetAllPlatformConfigs(build_args): use_sysroot = GetArgValue(args, 'use_sysroot') if use_sysroot: # Only generate configurations for sysroots that have been installed. - for cpu in ('x86', 'x64', 'arm', 'arm64'): + for cpu in ('x64', 'arm', 'arm64'): if LinuxSysrootExists(cpu): supported_cpus.append(cpu) else: