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 129.0.6668.0

Browse Source 
- Mac: Minimum system version is now 11.0.
- Win: Windows SDK version is now 10.0.22621.2428.
This commit is contained in:
Nik Pavlov
2024-08-26 12:44:25 +00:00
committed by Marshall Greenblatt
parent 2cd405baac
commit af1f40a2d3
94 changed files with 875 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
patch/patches/views_widget.patch
View File

@ -23,7 +23,7 @@ index cef40af382b1e..a2cf4691edc37 100644
case ui::SHOW_STATE_END:
return ui::SHOW_STATE_NORMAL;
diff --git components/sessions/core/session_service_commands.cc components/sessions/core/session_service_commands.cc
index 618e95c4e4b10..028612a57382e 100644
index 5cd1fb6938b07..3eec7d48690ca 100644
--- components/sessions/core/session_service_commands.cc
+++ components/sessions/core/session_service_commands.cc
@@ -165,9 +165,10 @@ enum PersistedWindowShowState {
@ -61,10 +61,10 @@ index 791fc1874851e..db58beed440f8 100644
case ui::SHOW_STATE_MAXIMIZED:
return kSerializedShowStateMaximized;
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index ae1a7849dab02..89db94663ad59 100644
index 540ce029150ef..e1deecb21b39f 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -708,6 +708,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
@@ -709,6 +709,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
return scale_override_for_capture_;
}
@ -80,7 +80,7 @@ index ae1a7849dab02..89db94663ad59 100644
if (!GetMouseWheelPhaseHandler())
return;
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 41308c925e5e3..bd958ba6acaa8 100644
index 177587d0a67ad..5d70ef26a16e1 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -76,6 +76,7 @@ namespace content {
@ -91,7 +91,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
class ScopedViewTransitionResources;
class TextInputManager;
class TouchSelectionControllerClientManager;
@@ -203,6 +204,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -204,6 +205,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
float GetDeviceScaleFactor() const final;
bool IsPointerLocked() override;
@ -101,7 +101,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
// Identical to `CopyFromSurface()`, except that this method issues the
// `viz::CopyOutputRequest` against the exact `viz::Surface` currently
// embedded by this View, while `CopyFromSurface()` may return a copy of any
@@ -264,6 +268,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -265,6 +269,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// Called when screen information or native widget bounds change.
virtual void UpdateScreenInfo();
@ -112,7 +112,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
// Called by the TextInputManager to notify the view about being removed from
// the list of registered views, i.e., TextInputManager is no longer tracking
// TextInputState from this view. The RWHV should reset |text_input_manager_|
@@ -388,6 +396,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -391,6 +399,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) = 0;
@ -125,7 +125,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
// Indicates whether the page has finished loading.
virtual void SetIsLoading(bool is_loading) = 0;
@@ -648,6 +662,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -651,6 +665,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// to all displays.
gfx::Size system_cursor_size_;
@ -136,7 +136,7 @@ index 41308c925e5e3..bd958ba6acaa8 100644
private:
FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest,
@@ -669,10 +687,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -672,10 +690,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
void SynchronizeVisualProperties();
@ -233,10 +233,10 @@ index e9bb4ee5bccee..e6172b1a8d53f 100644
// Remember this mapping from hwnd to Window*.
hwnd_root_window_map_[root_window_hwnd] = window;
diff --git ui/base/mojom/ui_base_types_mojom_traits.h ui/base/mojom/ui_base_types_mojom_traits.h
index b2a480b1717d1..306a4e3b1abc4 100644
index fba41cdefe707..1ed9995ac574c 100644
--- ui/base/mojom/ui_base_types_mojom_traits.h
+++ ui/base/mojom/ui_base_types_mojom_traits.h
@@ -172,6 +172,7 @@ struct EnumTraits<ui::mojom::WindowShowState, ui::WindowShowState> {
@@ -129,6 +129,7 @@ struct EnumTraits<ui::mojom::WindowShowState, ui::WindowShowState> {
case ui::SHOW_STATE_INACTIVE:
return ui::mojom::WindowShowState::SHOW_STATE_INACTIVE;
case ui::SHOW_STATE_MINIMIZED:
@ -245,7 +245,7 @@ index b2a480b1717d1..306a4e3b1abc4 100644
case ui::SHOW_STATE_MAXIMIZED:
return ui::mojom::WindowShowState::SHOW_STATE_MAXIMIZED;
diff --git ui/base/ui_base_types.h ui/base/ui_base_types.h
index 2cf9330a4e24b..4bf0890ae000b 100644
index fc6bfb3c09f47..0b8910bd53c0d 100644
--- ui/base/ui_base_types.h
+++ ui/base/ui_base_types.h
@@ -26,7 +26,8 @@ enum WindowShowState {
@ -259,10 +259,10 @@ index 2cf9330a4e24b..4bf0890ae000b 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 74b4887f9a6fd..11f78739d9d61 100644
index 79f348169de79..e1e7cb876f697 100644
--- ui/ozone/platform/x11/x11_window.cc
+++ ui/ozone/platform/x11/x11_window.cc
@@ -1869,7 +1869,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@@ -1874,7 +1874,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds);
@ -286,10 +286,10 @@ index e31c5b4cb6726..1b724948c2868 100644
return host ? host->GetAcceleratedWidget() : nullptr;
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
index 87179d2dfc301..92d31c96bb0b1 100644
index 684eab466f51f..88ec59d97d926 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -194,6 +194,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@@ -195,6 +195,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
return result;
}
@ -308,7 +308,7 @@ index 87179d2dfc301..92d31c96bb0b1 100644
void DesktopWindowTreeHostLinux::DispatchEvent(ui::Event* event) {
// In Windows, the native events sent to chrome are separated into client
// and non-client versions of events, which we record on our LocatedEvent
@@ -329,6 +341,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
@@ -330,6 +342,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
properties->wayland_app_id = params.wayland_app_id;
@ -318,10 +318,10 @@ index 87179d2dfc301..92d31c96bb0b1 100644
properties->x11_extension_delegate = this;
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
index e698f71577c51..8a6e28128564d 100644
index 590f97eee1fda..3980e814e80b9 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
@@ -62,6 +62,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -63,6 +63,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
// client-drawn shadow.
virtual void UpdateFrameHints();
@ -330,7 +330,7 @@ index e698f71577c51..8a6e28128564d 100644
protected:
// Overridden from DesktopWindowTreeHost:
void Init(const Widget::InitParams& params) override;
@@ -71,6 +73,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -72,6 +74,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
const gfx::Vector2d& drag_offset,
Widget::MoveLoopSource source,
Widget::MoveLoopEscapeBehavior escape_behavior) override;
@ -339,7 +339,7 @@ index e698f71577c51..8a6e28128564d 100644
// PlatformWindowDelegate:
void DispatchEvent(ui::Event* event) override;
@@ -120,6 +124,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -121,6 +125,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
uint32_t modal_dialog_counter_ = 0;
@ -350,7 +350,7 @@ index e698f71577c51..8a6e28128564d 100644
base::WeakPtrFactory<DesktopWindowTreeHostLinux> 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 6eb1cf9451db1..97b1c9bcebb1d 100644
index 5f736a0efcdcf..53368d1a6ee35 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -281,8 +281,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
@ -365,7 +365,7 @@ index 6eb1cf9451db1..97b1c9bcebb1d 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 269aabace2510..8e9c115c381fd 100644
index 668b9bbb908a5..74a14a5fe6236 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 @@
@ -376,7 +376,7 @@ index 269aabace2510..8e9c115c381fd 100644
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/class_property.h"
#include "ui/base/cursor/cursor.h"
@@ -183,22 +184,42 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -184,22 +185,42 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
native_widget_delegate_.get());
HWND parent_hwnd = nullptr;
@ -423,7 +423,7 @@ index 269aabace2510..8e9c115c381fd 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.
@@ -1025,10 +1046,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) {
@@ -1073,10 +1094,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) {
if (!native_widget_delegate_->IsNativeWidgetInitialized())
return;
@ -449,7 +449,7 @@ index 269aabace2510..8e9c115c381fd 100644
}
void DesktopWindowTreeHostWin::HandleClientSizeChanged(
@@ -1045,11 +1079,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -1094,11 +1128,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@ -467,7 +467,7 @@ index 269aabace2510..8e9c115c381fd 100644
}
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1057,6 +1095,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1106,6 +1144,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents())
return true;
@ -480,7 +480,7 @@ index 269aabace2510..8e9c115c381fd 100644
SendEventToSink(event);
return event->handled();
}
@@ -1235,8 +1279,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
@@ -1288,9 +1332,17 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
// positions in variable-DPI situations. See https://crbug.com/1224715 for
// details.
aura::Window* root = nullptr;
@ -490,7 +490,8 @@ index 269aabace2510..8e9c115c381fd 100644
+ root = AsWindowTreeHost()->window();
+ }
+ gfx::Rect bounds_in_pixels =
display::Screen::GetScreen()->DIPToScreenRectInWindow(root, bounds);
display::Screen::GetScreen()->DIPToScreenRectInWindow(
root, AdjustedContentBounds(bounds));
+ if (has_external_parent_) {
+ // Child windows always have origin (0,0).
+ bounds_in_pixels.set_origin(gfx::Point(0, 0));
@ -499,10 +500,10 @@ index 269aabace2510..8e9c115c381fd 100644
}
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 8169f17982253..fd8c22449a6a3 100644
index 531c73e496ab8..453f354a04a75 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -324,6 +324,14 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -328,6 +328,14 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// True if the window should have the frame removed.
bool remove_standard_frame_;
@ -518,10 +519,10 @@ index 8169f17982253..fd8c22449a6a3 100644
// the implementation of ::ShowCursor() is based on a counter, so making this
// member static ensures that ::ShowCursor() is always called exactly once
diff --git ui/views/widget/native_widget_mac.mm ui/views/widget/native_widget_mac.mm
index e13f3a3fe4e9a..8827c0355b665 100644
index c4a8bc0390517..30afff712ad8e 100644
--- ui/views/widget/native_widget_mac.mm
+++ ui/views/widget/native_widget_mac.mm
@@ -656,6 +656,7 @@ void NativeWidgetMac::Show(ui::WindowShowState show_state,
@@ -660,6 +660,7 @@ void NativeWidgetMac::Show(ui::WindowShowState show_state,
break;
case ui::SHOW_STATE_MAXIMIZED:
case ui::SHOW_STATE_FULLSCREEN:
@ -530,10 +531,10 @@ index e13f3a3fe4e9a..8827c0355b665 100644
break;
case ui::SHOW_STATE_END:
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 2fac5a83aac46..8db0925bf0edd 100644
index ef981eeb13aba..8457c7a8d2b8f 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -412,7 +412,8 @@ void Widget::Init(InitParams params) {
@@ -411,7 +411,8 @@ void Widget::Init(InitParams params) {
}
params.child |= (params.type == InitParams::TYPE_CONTROL);
@ -543,7 +544,7 @@ index 2fac5a83aac46..8db0925bf0edd 100644
is_headless_ = params.ShouldInitAsHeadless();
is_autosized_ = params.autosize;
@@ -508,9 +509,14 @@ void Widget::Init(InitParams params) {
@@ -518,9 +519,14 @@ void Widget::Init(InitParams params) {
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
Maximize();
@ -558,7 +559,7 @@ index 2fac5a83aac46..8db0925bf0edd 100644
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -524,7 +530,12 @@ void Widget::Init(InitParams params) {
@@ -534,7 +540,12 @@ void Widget::Init(InitParams params) {
} else if (delegate) {
SetContentsView(delegate->TransferOwnershipOfContentsView());
if (should_set_initial_bounds) {
@ -572,7 +573,7 @@ index 2fac5a83aac46..8db0925bf0edd 100644
}
}
@@ -1723,10 +1734,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
@@ -1733,10 +1744,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
}
gfx::Size Widget::GetMinimumSize() const {
@ -589,7 +590,7 @@ index 2fac5a83aac46..8db0925bf0edd 100644
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
}
@@ -1978,7 +1995,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
@@ -1988,7 +2005,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
return false;
View* v = widget_delegate_->GetInitiallyFocusedView();
if (!focus_on_creation_ || show_state == ui::SHOW_STATE_INACTIVE ||
@ -600,10 +601,10 @@ index 2fac5a83aac46..8db0925bf0edd 100644
// focus when the window is restored.
if (v)
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 721aa7432abbe..70dbf0eeb737e 100644
index e0429200e216e..bc07e44566c8a 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -370,6 +370,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -366,6 +366,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// the concept with bubble anchoring a la BubbleDialogDelegateView.
gfx::NativeView parent = gfx::NativeView();
@ -612,7 +613,7 @@ index 721aa7432abbe..70dbf0eeb737e 100644
// Specifies the initial bounds of the Widget. Default is empty, which means
// the NativeWidget may specify a default size. If the parent is specified,
// |bounds| is in the parent's coordinate system. If the parent is not
@@ -776,7 +778,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -779,7 +781,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
void ShowInactive();
// Activates the widget, assuming it already exists and is visible.
@ -622,10 +623,10 @@ index 721aa7432abbe..70dbf0eeb737e 100644
// Deactivates the widget, making the next window in the Z order the active
// window.
diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h
index d1f6be37fcf45..ca2fd8ce00561 100644
index fb32ce5680e28..59fac409aec4a 100644
--- ui/views/widget/widget_delegate.h
+++ ui/views/widget/widget_delegate.h
@@ -402,6 +402,10 @@ class VIEWS_EXPORT WidgetDelegate
@@ -395,6 +395,10 @@ class VIEWS_EXPORT WidgetDelegate {
// Returns true if the title text should be centered.
bool ShouldCenterWindowTitleText() const;
@ -637,7 +638,7 @@ index d1f6be37fcf45..ca2fd8ce00561 100644
bool enable_arrow_key_traversal() const {
return params_.enable_arrow_key_traversal;
diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc
index 3b9b00b7d79ae..e759e3c1a9f34 100644
index b162f426dbceb..017eb2562f6eb 100644
--- ui/views/widget/widget_hwnd_utils.cc
+++ ui/views/widget/widget_hwnd_utils.cc
@@ -63,7 +63,8 @@ void CalculateWindowStylesFromInitParams(
@ -651,7 +652,7 @@ index 3b9b00b7d79ae..e759e3c1a9f34 100644
if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index a3cd6a4bc6c8f..7d46a6f88a17e 100644
index 6dac746517416..98e1ac1011bf6 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -772,7 +772,11 @@ bool HWNDMessageHandler::IsVisible() const {
@ -667,7 +668,7 @@ index a3cd6a4bc6c8f..7d46a6f88a17e 100644
}
bool HWNDMessageHandler::IsMinimized() const {
@@ -3226,10 +3230,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3217,10 +3221,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
} else if (event.type() == ui::EventType::kMousewheel) {
ui::MouseWheelEvent mouse_wheel_event(msg);
// Reroute the mouse wheel to the window under the pointer if applicable.