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 138.0.7204.0 (#1465706)

Browse Source 
Mac: Require Xcode 16.3 (16E140) and SDK 15.4 (24E241)
This commit is contained in:
Marshall Greenblatt
2025-05-30 16:54:45 -04:00
parent c5e80eb44a
commit f8a746373e
81 changed files with 1080 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
patch/patches/views_widget.patch
View File

@@ -61,10 +61,10 @@ index 971e5273f1b05..a5d847f7f9d60 100644
case ui::mojom::WindowShowState::kMaximized:
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 30ec1b5e2688b..e9452c1eb9dee 100644
index 7caab47fb4e5b..72c43fc57abf6 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -602,6 +602,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
@@ -603,6 +603,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
return scale_override_for_capture_;
}
@@ -80,10 +80,10 @@ index 30ec1b5e2688b..e9452c1eb9dee 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 c93e93d13f101..cefd78e15857a 100644
index bad25563b4d28..a2ce20681d1db 100644
--- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -73,6 +73,7 @@ namespace content {
@@ -74,6 +74,7 @@ namespace content {
class DevicePosturePlatformProvider;
class MouseWheelPhaseHandler;
class RenderWidgetHostImpl;
@@ -91,7 +91,7 @@ index c93e93d13f101..cefd78e15857a 100644
class ScopedViewTransitionResources;
class TextInputManager;
class TouchSelectionControllerClientManager;
@@ -159,6 +160,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -158,6 +159,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
virtual void DidOverscroll(const ui::DidOverscrollParams& params) {}
@@ -101,7 +101,7 @@ index c93e93d13f101..cefd78e15857a 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
@@ -229,6 +233,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -244,6 +248,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// Called when screen information or native widget bounds change.
virtual void UpdateScreenInfo();
@@ -112,7 +112,7 @@ index c93e93d13f101..cefd78e15857a 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_|
@@ -355,6 +363,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -370,6 +378,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) = 0;
@@ -125,7 +125,7 @@ index c93e93d13f101..cefd78e15857a 100644
// Indicates whether the page has finished loading.
virtual void SetIsLoading(bool is_loading) = 0;
@@ -623,6 +637,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -638,6 +652,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// to all displays.
gfx::Size system_cursor_size_;
@@ -136,7 +136,7 @@ index c93e93d13f101..cefd78e15857a 100644
private:
FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest,
@@ -644,10 +662,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -659,10 +677,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
void SynchronizeVisualProperties();
@@ -196,7 +196,7 @@ index 41b34a27176a3..bdf5f9d4bb61e 100644
if (host_ && set_focus_on_mouse_down_or_key_event_) {
set_focus_on_mouse_down_or_key_event_ = false;
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index 1c6b2efc652ee..15003a27cd0db 100644
index 23eb991f4c777..404ab4e7c0aef 100644
--- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h
@@ -255,6 +255,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -246,10 +246,10 @@ index aeaf8e35f7eda..4b7cc3f03d3cf 100644
+ [MinVersion=1] kEnd = 7,
};
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
index 8ddea1c9ed5ee..7e92ecf2c5a5f 100644
index a83b9d91e9502..4e53d1ff1f4d9 100644
--- ui/ozone/platform/x11/x11_window.cc
+++ ui/ozone/platform/x11/x11_window.cc
@@ -1834,7 +1834,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@@ -1882,7 +1882,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0;
last_set_bounds_px_ = SanitizeBounds(bounds);
@@ -354,7 +354,7 @@ index 2150c344075c7..feb1abf159d51 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 6ad16425f2fb3..f2e5c506e23f5 100644
index 18cd413e87801..4e22373f50fc2 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -24,6 +24,7 @@
@@ -365,7 +365,7 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/class_property.h"
#include "ui/base/cursor/cursor.h"
@@ -199,7 +200,10 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -193,7 +194,10 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
native_widget_delegate_.get());
HWND parent_hwnd = nullptr;
@@ -377,7 +377,7 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
}
@@ -207,9 +211,18 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -201,9 +205,18 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
has_non_client_view_ = Widget::RequiresNonClientView(params.type);
z_order_ = params.EffectiveZOrderLevel();
@@ -398,17 +398,8 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
+
message_handler_->Init(parent_hwnd, pixel_bounds);
// If the Redirection Surface is removed, there needs to be a replacement
@@ -221,7 +234,7 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
// gutter.
if (((message_handler_->window_ex_style() & WS_EX_NOREDIRECTIONBITMAP) ==
WS_EX_NOREDIRECTIONBITMAP) &&
- !message_handler_->is_translucent()) {
+ !message_handler_->is_translucent() && !has_external_parent_) {
// Ensure that the hwnd has been created.
CHECK(GetHWND());
@@ -253,6 +266,13 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
UpdateWUCBackdrop();
@@ -212,6 +225,13 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
InitHost();
window()->Show();
@@ -422,16 +413,7 @@ index 6ad16425f2fb3..f2e5c506e23f5 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.
@@ -284,7 +304,7 @@ void DesktopWindowTreeHostWin::OnWidgetInitDone() {}
void DesktopWindowTreeHostWin::OnWidgetThemeChanged(
ui::ColorProviderKey::ColorMode color_mode) {
- if (ShouldApplySystemBackdrop()) {
+ if (ShouldApplySystemBackdrop() && !has_external_parent_) {
// Ensure that DWM knows to apply the correct color scheme to the window
// backdrop whenever it changes.
BOOL use_dark_mode =
@@ -1207,6 +1227,18 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) {
@@ -1152,6 +1172,18 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) {
if (restored) {
window()->Show();
@@ -450,7 +432,7 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
} else {
window()->Hide();
}
@@ -1228,11 +1260,17 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -1173,11 +1205,17 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@@ -470,7 +452,7 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
}
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1241,6 +1279,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1186,6 +1224,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
return true;
}
@@ -483,7 +465,7 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
SendEventToSink(event);
return event->handled();
}
@@ -1426,9 +1470,17 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
@@ -1371,9 +1415,17 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
// positions in variable-DPI situations. See https://crbug.com/1224715 for
// details.
aura::Window* root = nullptr;
@@ -502,11 +484,20 @@ index 6ad16425f2fb3..f2e5c506e23f5 100644
AsWindowTreeHost()->SetBoundsInPixels(bounds_in_pixels);
}
@@ -1503,7 +1555,7 @@ void DesktopWindowTreeHostWin::UpdateWUCBackdrop() {
if (GetWidget() &&
((message_handler_->window_ex_style() & WS_EX_NOREDIRECTIONBITMAP) ==
WS_EX_NOREDIRECTIONBITMAP) &&
- !message_handler_->is_translucent()) {
+ !message_handler_->is_translucent() && !has_external_parent_) {
// Ensure that the hwnd has been created.
CHECK(GetHWND());
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 dab595aacaeca..c10488756a657 100644
index 28cbd63261275..70b6b6f211807 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -348,6 +348,14 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -354,6 +354,14 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// A Windows.Ui.Composition visual tree that represents the window backdrop.
std::unique_ptr<gfx::WUCBackdrop> wuc_backdrop_;
@@ -534,7 +525,7 @@ index 16790a4b9d155..7d5f11cdb3a53 100644
break;
case ui::mojom::WindowShowState::kEnd:
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 5270118d8f8dc..98f974c10834a 100644
index 8a930340a16df..57ca3548db800 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -233,8 +233,8 @@ bool Widget::InitParams::ShouldInitAsHeadless() const {
@@ -548,7 +539,7 @@ index 5270118d8f8dc..98f974c10834a 100644
}
void Widget::InitParams::SetParent(gfx::NativeView parent_view) {
@@ -460,7 +460,8 @@ void Widget::Init(InitParams params) {
@@ -469,7 +469,8 @@ void Widget::Init(InitParams params) {
}
params.child |= (params.type == InitParams::TYPE_CONTROL);
@@ -558,7 +549,7 @@ index 5270118d8f8dc..98f974c10834a 100644
is_headless_ = params.ShouldInitAsHeadless();
is_autosized_ = params.autosize;
@@ -556,9 +557,14 @@ void Widget::Init(InitParams params) {
@@ -565,9 +566,14 @@ void Widget::Init(InitParams params) {
if (show_state == ui::mojom::WindowShowState::kMaximized) {
Maximize();
@@ -573,7 +564,7 @@ index 5270118d8f8dc..98f974c10834a 100644
}
#if BUILDFLAG(IS_CHROMEOS)
@@ -571,7 +577,12 @@ void Widget::Init(InitParams params) {
@@ -580,7 +586,12 @@ void Widget::Init(InitParams params) {
} else if (delegate) {
SetContentsView(delegate->TransferOwnershipOfContentsView());
if (should_set_initial_bounds) {
@@ -587,7 +578,7 @@ index 5270118d8f8dc..98f974c10834a 100644
}
}
@@ -1928,10 +1939,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
@@ -1937,10 +1948,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
}
gfx::Size Widget::GetMinimumSize() const {
@@ -604,7 +595,7 @@ index 5270118d8f8dc..98f974c10834a 100644
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
}
@@ -2220,7 +2237,8 @@ bool Widget::SetInitialFocus(ui::mojom::WindowShowState show_state) {
@@ -2229,7 +2246,8 @@ bool Widget::SetInitialFocus(ui::mojom::WindowShowState show_state) {
View* v = widget_delegate_->GetInitiallyFocusedView();
if (!focus_on_creation_ ||
show_state == ui::mojom::WindowShowState::kInactive ||
@@ -615,7 +606,7 @@ index 5270118d8f8dc..98f974c10834a 100644
// focus when the window is restored.
if (v) {
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 65154f18c7ce7..67c626d78e5d3 100644
index dfe785f5d0a54..35bd7b086358b 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -437,6 +437,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -625,9 +616,9 @@ index 65154f18c7ce7..67c626d78e5d3 100644
+ gfx::AcceleratedWidget parent_widget = gfx::kNullAcceleratedWidget;
+
// 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
@@ -892,7 +894,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// the NativeWidget may specify a default size. If the parent is specified
// and the widget type is not WINDOW_TYPE_POPUP, `bounds` is in the parent's
@@ -896,7 +898,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
void SetVisible(bool visible);
// Activates the widget, assuming it already exists and is visible.
@@ -637,7 +628,7 @@ index 65154f18c7ce7..67c626d78e5d3 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 7c2463cb91d00..72c6a239ecc21 100644
index d2011a5c04973..947c0bd535c0f 100644
--- ui/views/widget/widget_delegate.h
+++ ui/views/widget/widget_delegate.h
@@ -24,6 +24,9 @@
@@ -650,7 +641,7 @@ index 7c2463cb91d00..72c6a239ecc21 100644
class DesktopMediaPickerDialogView;
class DigitalIdentityMultiStepDialogDelegate;
class DownloadBubbleContentsViewTest;
@@ -375,6 +378,8 @@ class VIEWS_EXPORT WidgetDelegate {
@@ -378,6 +381,8 @@ class VIEWS_EXPORT WidgetDelegate {
// These existing cases are "grandfathered in", but there shouldn't be more.
// See comments atop `SetOwnedByWidget()`.
friend class ::AutoPipSettingView;
@@ -659,7 +650,7 @@ index 7c2463cb91d00..72c6a239ecc21 100644
friend class ::DigitalIdentityMultiStepDialogDelegate;
friend class ::DownloadBubbleContentsViewTest;
friend class ::DownloadBubbleSecurityViewTest;
@@ -471,6 +476,9 @@ class VIEWS_EXPORT WidgetDelegate {
@@ -473,6 +478,9 @@ class VIEWS_EXPORT WidgetDelegate {
// DO NOT ADD TO THIS LIST!
// These existing cases are "grandfathered in", but there shouldn't be more.
// See comments atop `RegisterDeleteDelegateCallback()`.
@@ -669,7 +660,7 @@ index 7c2463cb91d00..72c6a239ecc21 100644
friend class ::DesktopMediaPickerDialogView;
friend class ::MediaGalleriesDialogViews;
friend class ::PresentationReceiverWindowView;
@@ -795,6 +803,10 @@ class VIEWS_EXPORT WidgetDelegate {
@@ -797,6 +805,10 @@ class VIEWS_EXPORT WidgetDelegate {
// Returns true if the title text should be centered.
bool ShouldCenterWindowTitleText() const;
@@ -680,7 +671,7 @@ index 7c2463cb91d00..72c6a239ecc21 100644
bool focus_traverses_out() const { return params_.focus_traverses_out; }
bool enable_arrow_key_traversal() const {
return params_.enable_arrow_key_traversal;
@@ -917,7 +929,6 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
@@ -926,7 +938,6 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
const Widget* GetWidget() const override;
View* GetContentsView() override;
@@ -688,7 +679,7 @@ index 7c2463cb91d00..72c6a239ecc21 100644
// DO NOT ADD TO THIS LIST!
// These existing cases are "grandfathered in", but there shouldn't be more.
// See comments atop class.
@@ -984,6 +995,7 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
@@ -993,6 +1004,7 @@ class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
WidgetDelegateView();
@@ -711,10 +702,10 @@ index fe68bce38527b..c5fcee907f34f 100644
if (native_widget_delegate->IsDialogBox()) {
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index ac502dee8a217..b074472db272f 100644
index cb66f6e84abd9..d7270039dd0cb 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -797,7 +797,11 @@ bool HWNDMessageHandler::IsVisible() const {
@@ -798,7 +798,11 @@ bool HWNDMessageHandler::IsVisible() const {
}
bool HWNDMessageHandler::IsActive() const {
@@ -727,7 +718,7 @@ index ac502dee8a217..b074472db272f 100644
}
bool HWNDMessageHandler::IsMinimized() const {
@@ -3275,10 +3279,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3268,10 +3272,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.