diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 0386b4942..715f0ec71 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/125.0.6422.14', + 'chromium_checkout': 'refs/tags/125.0.6422.26', 'depot_tools_checkout': '4246ba023a' } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 6846e5d16..0902918ca 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -131,7 +131,7 @@ index d6c14b3d70a75..577586f0dd8b4 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index cf9de7df6299d..3f93ff73ab038 100644 +index 03620f99e45d9..fbca89163c8e7 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -267,6 +267,25 @@ @@ -171,7 +171,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_(std::make_unique( -@@ -678,6 +701,12 @@ Browser::~Browser() { +@@ -679,6 +702,12 @@ Browser::~Browser() { // away so they don't try and call back to us. if (select_file_dialog_.get()) select_file_dialog_->ListenerDestroyed(); @@ -184,7 +184,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } /////////////////////////////////////////////////////////////////////////////// -@@ -1109,6 +1138,8 @@ void Browser::WindowFullscreenStateChanged() { +@@ -1110,6 +1139,8 @@ void Browser::WindowFullscreenStateChanged() { ->WindowFullscreenStateChanged(); command_controller_->FullscreenStateChanged(); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); @@ -193,7 +193,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } void Browser::FullscreenTopUIStateChanged() { -@@ -1450,6 +1481,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1451,6 +1482,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -208,7 +208,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1457,8 +1496,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1458,8 +1497,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -229,7 +229,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } bool Browser::TabsNeedBeforeUnloadFired() const { -@@ -1660,6 +1709,16 @@ WebContents* Browser::OpenURLFromTab( +@@ -1661,6 +1710,16 @@ WebContents* Browser::OpenURLFromTab( } #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -246,7 +246,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1822,6 +1881,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1823,6 +1882,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool should_show_loading_ui) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); @@ -255,7 +255,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } void Browser::CloseContents(WebContents* source) { -@@ -1850,6 +1911,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -1851,6 +1912,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -264,7 +264,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 if (!GetStatusBubble()) return; -@@ -1857,6 +1920,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -1858,6 +1921,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -282,7 +282,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 void Browser::ContentsMouseEvent(WebContents* source, bool motion, bool exited) { -@@ -1881,6 +1955,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { +@@ -1882,6 +1956,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { return false; } @@ -302,7 +302,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { -@@ -1980,12 +2067,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -1981,12 +2068,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -327,7 +327,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 // Don't show the page hung dialog when a HTML popup hangs because // the dialog will take the focus and immediately close the popup. RenderWidgetHostView* view = render_widget_host->GetView(); -@@ -1998,6 +2097,13 @@ void Browser::RendererUnresponsive( +@@ -1999,6 +2098,13 @@ void Browser::RendererUnresponsive( void Browser::RendererResponsive( WebContents* source, content::RenderWidgetHost* render_widget_host) { @@ -341,7 +341,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 RenderWidgetHostView* view = render_widget_host->GetView(); if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) { TabDialogs::FromWebContents(source)->HideHungRendererDialog( -@@ -2051,6 +2157,11 @@ void Browser::DraggableRegionsChanged( +@@ -2052,6 +2158,11 @@ void Browser::DraggableRegionsChanged( if (app_controller_) { app_controller_->DraggableRegionsChanged(regions, contents); } @@ -353,7 +353,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } void Browser::DidFinishNavigation( -@@ -2132,11 +2243,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -2133,11 +2244,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -369,7 +369,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2336,6 +2451,15 @@ void Browser::RequestMediaAccessPermission( +@@ -2337,6 +2452,15 @@ void Browser::RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, content::MediaResponseCallback callback) { @@ -385,7 +385,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 const extensions::Extension* extension = GetExtensionForOrigin(profile_, request.security_origin); MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( -@@ -2880,9 +3004,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -2881,9 +3005,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -398,7 +398,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } // We hide the status bar for web apps windows as this matches native -@@ -2890,6 +3016,12 @@ StatusBubble* Browser::GetStatusBubble() { +@@ -2891,6 +3017,12 @@ StatusBubble* Browser::GetStatusBubble() { // mode, as the minimal browser UI includes the status bar. if (web_app::AppBrowserController::IsWebApp(this) && !app_controller()->HasMinimalUiButtons()) { @@ -411,7 +411,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 return nullptr; } -@@ -3026,6 +3158,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -3027,6 +3159,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); web_contents_collection_.StopObserving(web_contents); } @@ -420,7 +420,7 @@ index cf9de7df6299d..3f93ff73ab038 100644 } void Browser::TabDetachedAtImpl(content::WebContents* contents, -@@ -3180,6 +3314,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( +@@ -3181,6 +3315,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, bool check_can_support) const { diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 613705425..aac31f6ee 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 33c74865672bd..1640fe7378666 100644 +index 363f485ce3564..0afa082daf7e7 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -37,6 +37,7 @@ @@ -20,7 +20,7 @@ index 33c74865672bd..1640fe7378666 100644 #if BUILDFLAG(IS_CHROMEOS_LACROS) // In debug builds of Lacros, we keep track of when the user data dir // is initialized, to ensure the cryptohome is not accessed before login -@@ -854,6 +858,10 @@ ChromeMainDelegate::~ChromeMainDelegate() { +@@ -845,6 +849,10 @@ ChromeMainDelegate::~ChromeMainDelegate() { ChromeMainDelegate::~ChromeMainDelegate() = default; #endif // !BUILDFLAG(IS_ANDROID) @@ -31,7 +31,7 @@ index 33c74865672bd..1640fe7378666 100644 std::optional ChromeMainDelegate::PostEarlyInitialization( InvokedIn invoked_in) { DUMP_WILL_BE_CHECK(base::ThreadPoolInstance::Get()); -@@ -879,7 +887,7 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( +@@ -870,7 +878,7 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( // future session's metrics. DeferBrowserMetrics(user_data_dir); @@ -40,7 +40,7 @@ index 33c74865672bd..1640fe7378666 100644 // In the case the process is not the singleton process, the uninstall tasks // need to be executed here. A window will be displayed asking to close all // running instances. -@@ -1061,7 +1069,8 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( +@@ -1062,7 +1070,8 @@ std::optional ChromeMainDelegate::PostEarlyInitialization( if (base::FeatureList::IsEnabled( features::kWriteBasicSystemProfileToPersistentHistogramsFile)) { @@ -50,7 +50,7 @@ index 33c74865672bd..1640fe7378666 100644 #if BUILDFLAG(IS_ANDROID) record = base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions); -@@ -1506,6 +1515,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1507,6 +1516,7 @@ void ChromeMainDelegate::PreSandboxStartup() { std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); @@ -58,7 +58,7 @@ index 33c74865672bd..1640fe7378666 100644 crash_reporter::InitializeCrashKeys(); #if BUILDFLAG(IS_CHROMEOS_LACROS) -@@ -1524,6 +1534,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1525,6 +1535,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitMacCrashReporter(command_line, process_type); SetUpInstallerPreferences(command_line); #endif @@ -66,7 +66,7 @@ index 33c74865672bd..1640fe7378666 100644 #if BUILDFLAG(IS_WIN) child_process_logging::Init(); -@@ -1734,6 +1745,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1735,6 +1746,7 @@ void ChromeMainDelegate::PreSandboxStartup() { CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } @@ -74,7 +74,7 @@ index 33c74865672bd..1640fe7378666 100644 #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { -@@ -1769,6 +1781,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1770,6 +1782,7 @@ void ChromeMainDelegate::PreSandboxStartup() { // After all the platform Breakpads have been initialized, store the command // line for crash reporting. crash_keys::SetCrashKeysFromCommandLine(command_line); @@ -82,7 +82,7 @@ index 33c74865672bd..1640fe7378666 100644 #if BUILDFLAG(ENABLE_PDF) MaybePatchGdiGetFontData(); -@@ -1894,6 +1907,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1895,6 +1908,7 @@ void ChromeMainDelegate::ZygoteForked() { SetUpProfilingShutdownHandler(); } @@ -90,7 +90,7 @@ index 33c74865672bd..1640fe7378666 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 = -@@ -1906,6 +1920,7 @@ void ChromeMainDelegate::ZygoteForked() { +@@ -1907,6 +1921,7 @@ void ChromeMainDelegate::ZygoteForked() { // Reset the command line for the newly spawned process. crash_keys::SetCrashKeysFromCommandLine(*command_line); @@ -98,7 +98,7 @@ index 33c74865672bd..1640fe7378666 100644 } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -2002,6 +2017,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -2003,6 +2018,7 @@ void ChromeMainDelegate::InitializeMemorySystem() { const bool is_browser_process = process_type.empty(); const bool gwp_asan_boost_sampling = is_browser_process || IsCanaryDev(); @@ -106,7 +106,7 @@ index 33c74865672bd..1640fe7378666 100644 memory_system::Initializer() .SetGwpAsanParameters(gwp_asan_boost_sampling, process_type) .SetProfilingClientParameters(chrome::GetChannel(), -@@ -2011,5 +2027,5 @@ void ChromeMainDelegate::InitializeMemorySystem() { +@@ -2012,5 +2028,5 @@ void ChromeMainDelegate::InitializeMemorySystem() { memory_system::DispatcherParameters:: AllocationTraceRecorderInclusion::kDynamic, process_type) diff --git a/patch/patches/osr_win_remove_keyed_mutex_2575.patch b/patch/patches/osr_win_remove_keyed_mutex_2575.patch index 95c6f8bd3..d4eff9825 100644 --- a/patch/patches/osr_win_remove_keyed_mutex_2575.patch +++ b/patch/patches/osr_win_remove_keyed_mutex_2575.patch @@ -24,7 +24,7 @@ index ecabd51db586d..a7ae5e101ca02 100644 Microsoft::WRL::ComPtr d3d11_texture; diff --git media/video/renderable_gpu_memory_buffer_video_frame_pool.cc media/video/renderable_gpu_memory_buffer_video_frame_pool.cc -index a7ac0f10f11e5..bb1d7dc6e9168 100644 +index a7ac0f10f11e5..bbbfefd486660 100644 --- media/video/renderable_gpu_memory_buffer_video_frame_pool.cc +++ media/video/renderable_gpu_memory_buffer_video_frame_pool.cc @@ -198,7 +198,7 @@ gfx::Size GetBufferSizeInPixelsForVideoPixelFormat( diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index ff88a355e..383e44fdf 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index a52e22d0d43e3..e8403dac2961a 100644 +index f14801e94238e..fbf5b4a2ecebd 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -6,6 +6,7 @@ @@ -18,7 +18,7 @@ index a52e22d0d43e3..e8403dac2961a 100644 #include "content/public/common/page_visibility_state.h" #include "services/service_manager/public/cpp/interface_provider.h" #include "third_party/blink/public/common/input/web_input_event.h" -@@ -724,10 +726,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { +@@ -717,10 +719,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { void RenderWidgetHostViewAura::UpdateBackgroundColor() { DCHECK(GetBackgroundColor()); @@ -35,7 +35,7 @@ index a52e22d0d43e3..e8403dac2961a 100644 } #if BUILDFLAG(IS_WIN) -@@ -2357,6 +2361,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { +@@ -2350,6 +2354,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { window_->layer()->SetColor(GetBackgroundColor() ? *GetBackgroundColor() : SK_ColorWHITE); UpdateFrameSinkIdRegistration(); diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 9c7cae667..00cc012a5 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -350,7 +350,7 @@ index 3151a2c872f4e..e14caeb1e6645 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 b305f5c2238c2..e2bd0c430cea0 100644 +index 26b46d12db49d..4d591f6453b3d 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -285,8 +285,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) { @@ -365,7 +365,7 @@ index b305f5c2238c2..e2bd0c430cea0 100644 // Calculate initial bounds. diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index 99e20655e847e..6c3b3028e67fd 100644 +index b73f359426432..2f9bcb469bbb5 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -20,6 +20,7 @@ @@ -423,7 +423,7 @@ index 99e20655e847e..6c3b3028e67fd 100644 // Stack immediately above its parent so that it does not cover other // root-level windows, with the exception of menus, to allow them to be // displayed on top of other windows. -@@ -1020,10 +1041,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) { +@@ -1025,10 +1046,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) { if (!native_widget_delegate_->IsNativeWidgetInitialized()) return; @@ -449,7 +449,7 @@ index 99e20655e847e..6c3b3028e67fd 100644 } void DesktopWindowTreeHostWin::HandleClientSizeChanged( -@@ -1040,11 +1074,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() { +@@ -1045,11 +1079,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() { } void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) { @@ -467,7 +467,7 @@ index 99e20655e847e..6c3b3028e67fd 100644 } bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { -@@ -1052,6 +1090,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { +@@ -1057,6 +1095,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents()) return true; @@ -480,7 +480,7 @@ index 99e20655e847e..6c3b3028e67fd 100644 SendEventToSink(event); return event->handled(); } -@@ -1230,8 +1274,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) { +@@ -1235,8 +1279,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) { // positions in variable-DPI situations. See https://crbug.com/1224715 for // details. aura::Window* root = nullptr;