From f3f83ff8cf7e140ff5925a4986a9b1972924cb6b Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 30 Jan 2024 19:11:36 -0500 Subject: [PATCH] Update to Chromium version 122.0.6261.6 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 3 ++- patch/patches/views_widget.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index be27e2a23..0365e36e4 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/122.0.6261.0' + 'chromium_checkout': 'refs/tags/122.0.6261.6', + 'depot_tools_checkout': '10bd39fd47' } diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index b5677a272..7e04a8a1a 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -240,19 +240,19 @@ index 8bfbd2d675db6..ee90ad2884db7 100644 // Specifies which edges of the window are tiled. diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc -index 449f721727fb1..ab549b482bc36 100644 +index 986611404dd69..abefa63d5c2b8 100644 --- ui/ozone/platform/x11/x11_window.cc +++ ui/ozone/platform/x11/x11_window.cc -@@ -1846,7 +1846,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { +@@ -1868,7 +1868,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { req.border_pixel = 0; - last_set_bounds_px_ = SanitizeBounds(bounds); + bounds_in_pixels_ = SanitizeBounds(bounds); - req.parent = x_root_window_; + req.parent = properties.parent_widget == gfx::kNullAcceleratedWidget ? + x_root_window_ : static_cast(properties.parent_widget); - req.x = last_set_bounds_px_.x(); - req.y = last_set_bounds_px_.y(); - req.width = last_set_bounds_px_.width(); + req.x = bounds_in_pixels_.x(); + req.y = bounds_in_pixels_.y(); + req.width = bounds_in_pixels_.width(); diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc index e4e6d3104da9e..bb372b0cd2960 100644 --- ui/views/widget/desktop_aura/desktop_screen_win.cc