bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 122.0.6261.6

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-01-30 19:11:36 -05:00
parent d3a483ef59
commit f3f83ff8cf
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # 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'
} }

12
patch/patches/views_widget.patch
View File

@@ -240,19 +240,19 @@ index 8bfbd2d675db6..ee90ad2884db7 100644
// Specifies which edges of the window are tiled. // Specifies which edges of the window are tiled.
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc 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
+++ 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; req.border_pixel = 0;
last_set_bounds_px_ = SanitizeBounds(bounds); bounds_in_pixels_ = SanitizeBounds(bounds);
- req.parent = x_root_window_; - req.parent = x_root_window_;
+ req.parent = properties.parent_widget == gfx::kNullAcceleratedWidget ? + req.parent = properties.parent_widget == gfx::kNullAcceleratedWidget ?
+ x_root_window_ : static_cast<x11::Window>(properties.parent_widget); + x_root_window_ : static_cast<x11::Window>(properties.parent_widget);
req.x = last_set_bounds_px_.x(); req.x = bounds_in_pixels_.x();
req.y = last_set_bounds_px_.y(); req.y = bounds_in_pixels_.y();
req.width = last_set_bounds_px_.width(); 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 diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
index e4e6d3104da9e..bb372b0cd2960 100644 index e4e6d3104da9e..bb372b0cd2960 100644
--- ui/views/widget/desktop_aura/desktop_screen_win.cc --- ui/views/widget/desktop_aura/desktop_screen_win.cc