diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 40a4cdd53..9ab1921c5 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/108.0.5359.10', + 'chromium_checkout': 'refs/tags/108.0.5359.30', 'depot_tools_checkout': '64b6175557' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 87c06cf4c..4fdce2b0d 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 14dfb45da60c0..7e3ebfa6fb431 100644 +index 28605cda32c8a..ed83d689e3574 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -6669,6 +6669,14 @@ std::pair NavigationRequest:: +@@ -6677,6 +6677,14 @@ std::pair NavigationRequest:: origin_and_debug_info.second += ", error"; } @@ -38,7 +38,7 @@ index 14dfb45da60c0..7e3ebfa6fb431 100644 if (use_opaque_origin) { origin_and_debug_info = std::make_pair(origin_and_debug_info.first.DeriveNewOpaqueOrigin(), -@@ -6696,6 +6704,15 @@ std::pair NavigationRequest:: +@@ -6704,6 +6712,15 @@ std::pair NavigationRequest:: GetOriginForURLLoaderFactoryWithoutFinalFrameHostWithDebugInfo( SandboxFlagsToCommit()); diff --git a/patch/patches/build.patch b/patch/patches/build.patch index 0213814c5..0dbb0f68c 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 cd9b186a1252f..2d0d9310485fe 100644 +index 531b326c498d0..ee31a8d2feee5 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn -@@ -1862,8 +1862,6 @@ config("thin_archive") { +@@ -1866,8 +1866,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 9db2349eb..583d8ce0d 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 68415e75360ce..7a144a035b0a7 100644 +index 6af6b725815f6..0cfb285477821 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 68415e75360ce..7a144a035b0a7 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -1986,6 +1987,7 @@ static_library("browser") { +@@ -1988,6 +1989,7 @@ static_library("browser") { "//build/config/chromebox_for_meetings:buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index 68415e75360ce..7a144a035b0a7 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2537,6 +2539,10 @@ static_library("browser") { +@@ -2539,6 +2541,10 @@ static_library("browser") { ] } @@ -29,7 +29,7 @@ index 68415e75360ce..7a144a035b0a7 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -6394,8 +6400,6 @@ static_library("browser") { +@@ -6398,8 +6404,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_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 2838e0d4f..131fb9637 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 a4c41a8be6b23..0724b0e6e4ccf 100644 +index cced71a37ce11..2bb623d2bdb60 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -309,6 +309,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -42,7 +42,7 @@ index a4c41a8be6b23..0724b0e6e4ccf 100644 } RenderViewContextMenu::~RenderViewContextMenu() = default; -@@ -1160,6 +1179,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1157,6 +1176,12 @@ void RenderViewContextMenu::InitMenu() { // menu, meaning that each menu item added/removed in this function will cause // it to visibly jump on the screen (see b/173569669). AppendQuickAnswersItems(); @@ -55,7 +55,7 @@ index a4c41a8be6b23..0724b0e6e4ccf 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3031,6 +3056,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3022,6 +3047,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } @@ -69,7 +69,7 @@ index a4c41a8be6b23..0724b0e6e4ccf 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 a6df6ba30d454..9bbd84c9c8820 100644 +index 0e609102a42c0..73c38ed952d4a 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -134,6 +134,12 @@ class RenderViewContextMenu @@ -85,7 +85,7 @@ index a6df6ba30d454..9bbd84c9c8820 100644 protected: Profile* GetProfile() const; -@@ -381,6 +387,9 @@ class RenderViewContextMenu +@@ -386,6 +392,9 @@ class RenderViewContextMenu // built. bool is_protocol_submenu_valid_ = false; diff --git a/patch/patches/chrome_browser_permission_prompt.patch b/patch/patches/chrome_browser_permission_prompt.patch index e96441cd9..676519d13 100644 --- a/patch/patches/chrome_browser_permission_prompt.patch +++ b/patch/patches/chrome_browser_permission_prompt.patch @@ -44,7 +44,7 @@ index 40d27e69a17ce..a7e18b475dd18 100644 base::FeatureList::IsEnabled( features::kPeriodicSyncPermissionForDefaultSearchEngine) && diff --git chrome/browser/permissions/chrome_permissions_client.cc chrome/browser/permissions/chrome_permissions_client.cc -index 77faa54c6e8dc..d986538d36c2e 100644 +index 6d3f766751ebf..85de2088cd972 100644 --- chrome/browser/permissions/chrome_permissions_client.cc +++ chrome/browser/permissions/chrome_permissions_client.cc @@ -13,6 +13,7 @@ @@ -55,7 +55,7 @@ index 77faa54c6e8dc..d986538d36c2e 100644 #include "chrome/browser/bluetooth/bluetooth_chooser_context_factory.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" -@@ -211,6 +212,9 @@ ChromePermissionsClient::GetPermissionDecisionAutoBlocker( +@@ -219,6 +220,9 @@ ChromePermissionsClient::GetPermissionDecisionAutoBlocker( double ChromePermissionsClient::GetSiteEngagementScore( content::BrowserContext* browser_context, const GURL& origin) { @@ -65,7 +65,7 @@ index 77faa54c6e8dc..d986538d36c2e 100644 return site_engagement::SiteEngagementService::Get( Profile::FromBrowserContext(browser_context)) ->GetScore(origin); -@@ -295,8 +299,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors( +@@ -303,8 +307,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors( std::make_unique()); selectors.emplace_back(std::make_unique( Profile::FromBrowserContext(browser_context))); diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 5c5536131..c1ffc2535 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -14,7 +14,7 @@ index 8f94c350756b4..a243dbaadbc2b 100644 } diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc -index bd0f46ee1edce..f8efd6222175d 100644 +index a82af67cd3afb..c9dbd798dbeda 100644 --- chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc @@ -83,6 +83,7 @@ base::LazyInstance>::Leaky @@ -52,7 +52,7 @@ index bd0f46ee1edce..f8efd6222175d 100644 Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() { return CreateUnique(kDevToolsOTRProfileIDPrefix); diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h -index eb5172ba4789c..147c9d828708b 100644 +index bb7826c38d7ed..c99b96ee82fd5 100644 --- chrome/browser/profiles/profile.h +++ chrome/browser/profiles/profile.h @@ -99,6 +99,10 @@ class Profile : public content::BrowserContext { diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index ff6a17c5f..034a112dc 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -1,5 +1,5 @@ diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc -index 87c1c47fc868a..42d7929172abc 100644 +index dcd6659915114..b83f110bfe921 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -40,6 +40,7 @@ @@ -40,7 +40,7 @@ index 87c1c47fc868a..42d7929172abc 100644 base::sequence_manager::internal::ThreadControllerPowerMonitor:: InitializeOnMainThread(); base::InitializePlatformThreadFeatures(); -@@ -1221,6 +1230,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1225,6 +1234,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -48,7 +48,7 @@ index 87c1c47fc868a..42d7929172abc 100644 crash_reporter::InitializeCrashKeys(); #if BUILDFLAG(IS_POSIX) -@@ -1231,6 +1241,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1235,6 +1245,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitMacCrashReporter(command_line, process_type); SetUpInstallerPreferences(command_line); #endif @@ -56,7 +56,7 @@ index 87c1c47fc868a..42d7929172abc 100644 #if BUILDFLAG(IS_WIN) child_process_logging::Init(); -@@ -1433,6 +1444,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1437,6 +1448,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -64,7 +64,7 @@ index 87c1c47fc868a..42d7929172abc 100644 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { -@@ -1476,6 +1488,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1480,6 +1492,7 @@ void ChromeMainDelegate::PreSandboxStartup() { // After all the platform Breakpads have been initialized, store the command // line for crash reporting. crash_keys::SetCrashKeysFromCommandLine(command_line); @@ -72,7 +72,7 @@ index 87c1c47fc868a..42d7929172abc 100644 #if BUILDFLAG(ENABLE_PDF) MaybePatchGdiGetFontData(); -@@ -1574,6 +1587,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1578,6 +1591,7 @@ void ChromeMainDelegate::ZygoteForked() { SetUpProfilingShutdownHandler(); } @@ -80,7 +80,7 @@ index 87c1c47fc868a..42d7929172abc 100644 // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets // this up for the browser process in a different manner. const base::CommandLine* command_line = -@@ -1596,6 +1610,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1600,6 +1614,7 @@ void ChromeMainDelegate::ZygoteForked() { // Reset the command line for the newly spawned process. crash_keys::SetCrashKeysFromCommandLine(*command_line); @@ -324,7 +324,7 @@ index 10b5cf030a944..49b773042ad24 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 621b03d86a86a..c5a24d944f984 100644 +index 3eff9bc639bb1..49840f0f44529 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -11,6 +11,7 @@ diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index 1b867550b..b73c37424 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -41,10 +41,10 @@ index afefe3cd83dee..6668463247644 100644 } // namespace content diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index 0133090585389..9f619e6577bbd 100644 +index ff4e181fae184..5150ccf1e58b6 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc -@@ -3175,6 +3175,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { +@@ -3188,6 +3188,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE); } @@ -57,7 +57,7 @@ index 0133090585389..9f619e6577bbd 100644 const WebInputEvent& event) { if ((base::FeatureList::IsEnabled( diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h -index 688c6b226d839..f4b8a63aca530 100644 +index 6ea55a22496a5..c44aaee52c2c2 100644 --- content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h @@ -789,6 +789,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 4dec13326..4d6fe6571 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc -index b0c9044e9978f..13191e2d38387 100644 +index e5d57b6136722..1d34b6256823a 100644 --- content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc @@ -663,6 +663,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {