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 130.0.6723.0 (#1356013)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-09-27 14:15:44 +00:00
parent e44d33d5bf
commit cd052ec7c3
84 changed files with 758 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
patch/patches/views_widget.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/extensions/api/sessions/sessions_api.cc chrome/browser/extensions/api/sessions/sessions_api.cc
index 0efd00ba92039..7dc86733bcde3 100644
index 336481047adbb..e9848320bd560 100644
--- chrome/browser/extensions/api/sessions/sessions_api.cc
+++ chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -334,6 +334,7 @@ SessionsGetDevicesFunction::CreateWindowModel(
@@ -341,6 +341,7 @@ SessionsGetDevicesFunction::CreateWindowModel(
state = api::windows::WindowState::kNormal;
break;
case ui::SHOW_STATE_MINIMIZED:
@ -23,10 +23,10 @@ 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 5cd1fb6938b07..3eec7d48690ca 100644
index 6b72cf19cf723..48f7f6f2c1f75 100644
--- components/sessions/core/session_service_commands.cc
+++ components/sessions/core/session_service_commands.cc
@@ -165,9 +165,10 @@ enum PersistedWindowShowState {
@@ -166,9 +166,10 @@ enum PersistedWindowShowState {
PERSISTED_SHOW_STATE_MAXIMIZED = 3,
// SHOW_STATE_INACTIVE (4) never persisted.
PERSISTED_SHOW_STATE_FULLSCREEN = 5,
@ -40,31 +40,31 @@ index 5cd1fb6938b07..3eec7d48690ca 100644
};
// TODO(crbug.com/40946710): Remove this around December 2024. This is part of a
@@ -191,6 +192,7 @@ PersistedWindowShowState ShowStateToPersistedShowState(
case ui::SHOW_STATE_NORMAL:
@@ -193,6 +194,7 @@ PersistedWindowShowState ShowStateToPersistedShowState(
case ui::mojom::WindowShowState::kNormal:
return PERSISTED_SHOW_STATE_NORMAL;
case ui::SHOW_STATE_MINIMIZED:
+ case ui::SHOW_STATE_HIDDEN:
case ui::mojom::WindowShowState::kMinimized:
+ case ui::mojom::WindowShowState::kHidden:
return PERSISTED_SHOW_STATE_MINIMIZED;
case ui::SHOW_STATE_MAXIMIZED:
case ui::mojom::WindowShowState::kMaximized:
return PERSISTED_SHOW_STATE_MAXIMIZED;
diff --git components/sessions/core/tab_restore_service_impl.cc components/sessions/core/tab_restore_service_impl.cc
index 791fc1874851e..db58beed440f8 100644
index 514f81ee655f5..ba5ab6729b359 100644
--- components/sessions/core/tab_restore_service_impl.cc
+++ components/sessions/core/tab_restore_service_impl.cc
@@ -197,6 +197,7 @@ int SerializeWindowShowState(ui::WindowShowState show_state) {
case ui::SHOW_STATE_NORMAL:
@@ -198,6 +198,7 @@ int SerializeWindowShowState(ui::mojom::WindowShowState show_state) {
case ui::mojom::WindowShowState::kNormal:
return kSerializedShowStateNormal;
case ui::SHOW_STATE_MINIMIZED:
+ case ui::SHOW_STATE_HIDDEN:
case ui::mojom::WindowShowState::kMinimized:
+ case ui::mojom::WindowShowState::kHidden:
return kSerializedShowStateMinimized;
case ui::SHOW_STATE_MAXIMIZED:
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 540ce029150ef..e1deecb21b39f 100644
index 72c5c119911a6..7c1bccc2a048e 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -709,6 +709,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
@@ -590,6 +590,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
return scale_override_for_capture_;
}
@ -80,10 +80,10 @@ index 540ce029150ef..e1deecb21b39f 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 177587d0a67ad..5d70ef26a16e1 100644
index bdd8712db25a5..ae8a13e7f4c49 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 {
@@ -70,6 +70,7 @@ namespace content {
class DevicePosturePlatformProvider;
class MouseWheelPhaseHandler;
class RenderWidgetHostImpl;
@ -91,7 +91,7 @@ index 177587d0a67ad..5d70ef26a16e1 100644
class ScopedViewTransitionResources;
class TextInputManager;
class TouchSelectionControllerClientManager;
@@ -204,6 +205,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -150,6 +151,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
float GetDeviceScaleFactor() const final;
bool IsPointerLocked() override;
@ -101,7 +101,7 @@ index 177587d0a67ad..5d70ef26a16e1 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
@@ -265,6 +269,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -211,6 +215,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// Called when screen information or native widget bounds change.
virtual void UpdateScreenInfo();
@ -112,7 +112,7 @@ index 177587d0a67ad..5d70ef26a16e1 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_|
@@ -391,6 +399,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -337,6 +345,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
const gfx::Rect& bounds,
const gfx::Rect& anchor_rect) = 0;
@ -125,7 +125,7 @@ index 177587d0a67ad..5d70ef26a16e1 100644
// Indicates whether the page has finished loading.
virtual void SetIsLoading(bool is_loading) = 0;
@@ -651,6 +665,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -587,6 +601,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// to all displays.
gfx::Size system_cursor_size_;
@ -136,7 +136,7 @@ index 177587d0a67ad..5d70ef26a16e1 100644
private:
FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest,
@@ -672,10 +690,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -608,10 +626,6 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
void SynchronizeVisualProperties();
@ -232,37 +232,37 @@ index e9bb4ee5bccee..e6172b1a8d53f 100644
window->AddObserver(this);
// 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 fba41cdefe707..1ed9995ac574c 100644
--- ui/base/mojom/ui_base_types_mojom_traits.h
+++ ui/base/mojom/ui_base_types_mojom_traits.h
@@ -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:
+ case ui::SHOW_STATE_HIDDEN:
return ui::mojom::WindowShowState::SHOW_STATE_MINIMIZED;
case ui::SHOW_STATE_MAXIMIZED:
return ui::mojom::WindowShowState::SHOW_STATE_MAXIMIZED;
diff --git ui/base/mojom/window_show_state.mojom ui/base/mojom/window_show_state.mojom
index 526b6129d6d01..1937a441b930d 100644
--- ui/base/mojom/window_show_state.mojom
+++ ui/base/mojom/window_show_state.mojom
@@ -23,6 +23,7 @@ enum WindowShowState {
kMaximized = 3,
kInactive = 4, // Views only, not persisted.
kFullscreen = 5,
+ kHidden = 6,
// TODO(crbug.com/361560784): Investigate and Remove `kEnd`
- [MinVersion=1] kEnd = 6,
+ [MinVersion=1] kEnd = 7,
};
diff --git ui/base/ui_base_types.h ui/base/ui_base_types.h
index fc6bfb3c09f47..0b8910bd53c0d 100644
index c3f5337d50a09..8f95219e89259 100644
--- ui/base/ui_base_types.h
+++ ui/base/ui_base_types.h
@@ -26,7 +26,8 @@ enum WindowShowState {
SHOW_STATE_MAXIMIZED = 3,
SHOW_STATE_INACTIVE = 4, // Views only, not persisted.
SHOW_STATE_FULLSCREEN = 5,
- SHOW_STATE_END = 6 // The end of show state enum.
+ SHOW_STATE_HIDDEN = 6, // Views and MacOS only.
+ SHOW_STATE_END = 7 // The end of show state enum.
};
@@ -29,6 +29,8 @@ inline constexpr WindowShowState SHOW_STATE_INACTIVE =
ui::mojom::WindowShowState::kInactive;
inline constexpr WindowShowState SHOW_STATE_FULLSCREEN =
ui::mojom::WindowShowState::kFullscreen;
+inline constexpr WindowShowState SHOW_STATE_HIDDEN =
+ ui::mojom::WindowShowState::kHidden;
inline constexpr WindowShowState SHOW_STATE_END =
ui::mojom::WindowShowState::kEnd;
// 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 79f348169de79..e1e7cb876f697 100644
index e237b24eebe7c..39375a38fa680 100644
--- ui/ozone/platform/x11/x11_window.cc
+++ ui/ozone/platform/x11/x11_window.cc
@@ -1874,7 +1874,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@@ -1876,7 +1876,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds);
@ -365,7 +365,7 @@ index 5f736a0efcdcf..53368d1a6ee35 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 668b9bbb908a5..74a14a5fe6236 100644
index 66e1c0fa50581..da5ab727a5dab 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 668b9bbb908a5..74a14a5fe6236 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.
@@ -1073,10 +1094,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) {
@@ -1077,10 +1098,23 @@ void DesktopWindowTreeHostWin::HandleWindowMinimizedOrRestored(bool restored) {
if (!native_widget_delegate_->IsNativeWidgetInitialized())
return;
@ -449,7 +449,7 @@ index 668b9bbb908a5..74a14a5fe6236 100644
}
void DesktopWindowTreeHostWin::HandleClientSizeChanged(
@@ -1094,11 +1128,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -1098,11 +1132,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@ -467,7 +467,7 @@ index 668b9bbb908a5..74a14a5fe6236 100644
}
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1106,6 +1144,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1110,6 +1148,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents())
return true;
@ -480,7 +480,7 @@ index 668b9bbb908a5..74a14a5fe6236 100644
SendEventToSink(event);
return event->handled();
}
@@ -1288,9 +1332,17 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
@@ -1292,9 +1336,17 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
// positions in variable-DPI situations. See https://crbug.com/1224715 for
// details.
aura::Window* root = nullptr;
@ -500,12 +500,12 @@ index 668b9bbb908a5..74a14a5fe6236 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 531c73e496ab8..453f354a04a75 100644
index 286fcdf651131..a036eead2376a 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -328,6 +328,14 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// True if the window should have the frame removed.
bool remove_standard_frame_;
@@ -334,6 +334,14 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
// True if the window is allow to take screenshots, by default is true.
bool allow_screenshots_ = true;
+ // True if the widget has a external parent view/window outside of the
+ // Chromium-controlled view/window hierarchy.
@ -519,10 +519,10 @@ index 531c73e496ab8..453f354a04a75 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 c4a8bc0390517..30afff712ad8e 100644
index 4c9fcad42f8c7..79a13c77ea9a7 100644
--- ui/views/widget/native_widget_mac.mm
+++ ui/views/widget/native_widget_mac.mm
@@ -660,6 +660,7 @@ void NativeWidgetMac::Show(ui::WindowShowState show_state,
@@ -661,6 +661,7 @@ void NativeWidgetMac::Show(ui::WindowShowState show_state,
break;
case ui::SHOW_STATE_MAXIMIZED:
case ui::SHOW_STATE_FULLSCREEN:
@ -531,10 +531,10 @@ index c4a8bc0390517..30afff712ad8e 100644
break;
case ui::SHOW_STATE_END:
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index ef981eeb13aba..8457c7a8d2b8f 100644
index 0b36c074cb789..b706a99d3d889 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -411,7 +411,8 @@ void Widget::Init(InitParams params) {
@@ -422,7 +422,8 @@ void Widget::Init(InitParams params) {
}
params.child |= (params.type == InitParams::TYPE_CONTROL);
@ -544,7 +544,7 @@ index ef981eeb13aba..8457c7a8d2b8f 100644
is_headless_ = params.ShouldInitAsHeadless();
is_autosized_ = params.autosize;
@@ -518,9 +519,14 @@ void Widget::Init(InitParams params) {
@@ -529,9 +530,14 @@ void Widget::Init(InitParams params) {
if (show_state == ui::SHOW_STATE_MAXIMIZED) {
Maximize();
@ -559,7 +559,7 @@ index ef981eeb13aba..8457c7a8d2b8f 100644
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -534,7 +540,12 @@ void Widget::Init(InitParams params) {
@@ -545,7 +551,12 @@ void Widget::Init(InitParams params) {
} else if (delegate) {
SetContentsView(delegate->TransferOwnershipOfContentsView());
if (should_set_initial_bounds) {
@ -573,7 +573,7 @@ index ef981eeb13aba..8457c7a8d2b8f 100644
}
}
@@ -1733,10 +1744,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
@@ -1744,10 +1755,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
}
gfx::Size Widget::GetMinimumSize() const {
@ -590,7 +590,7 @@ index ef981eeb13aba..8457c7a8d2b8f 100644
return non_client_view_ ? non_client_view_->GetMaximumSize() : gfx::Size();
}
@@ -1988,7 +2005,8 @@ bool Widget::SetInitialFocus(ui::WindowShowState show_state) {
@@ -1999,7 +2016,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 ||
@ -601,7 +601,7 @@ index ef981eeb13aba..8457c7a8d2b8f 100644
// focus when the window is restored.
if (v)
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index e0429200e216e..bc07e44566c8a 100644
index c4c3d9b0443cc..d9b1661802d74 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -366,6 +366,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@ -652,7 +652,7 @@ index b162f426dbceb..017eb2562f6eb 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 6dac746517416..98e1ac1011bf6 100644
index cc7e087c50ea1..f4099bcdcdd18 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -772,7 +772,11 @@ bool HWNDMessageHandler::IsVisible() const {