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 128.0.6613.0 (#1331488)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-07-29 13:09:20 -04:00
parent a6c00b2ff6
commit 446b7d6535
96 changed files with 798 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
patch/patches/chrome_browser_dialogs_widget.patch
View File

@ -12,10 +12,10 @@ index b169371e4d42f..509e4bda85b47 100644
// on the screen, we can't actually attach to it.
parent_window = nullptr;
diff --git components/constrained_window/constrained_window_views.cc components/constrained_window/constrained_window_views.cc
index 0ffc333329d4d..91b7567c123ac 100644
index d0a13b1666772..2b604aa1da656 100644
--- components/constrained_window/constrained_window_views.cc
+++ components/constrained_window/constrained_window_views.cc
@@ -101,10 +101,17 @@ class WidgetModalDialogHostObserverViews : public views::WidgetObserver,
@@ -100,10 +100,17 @@ class ModalDialogHostObserverViews : public ModalDialogHostObserver {
gfx::Rect GetModalDialogBounds(views::Widget* widget,
web_modal::ModalDialogHost* dialog_host,
const gfx::Size& size) {
@ -36,7 +36,7 @@ index 0ffc333329d4d..91b7567c123ac 100644
}
gfx::Point position = dialog_host->GetDialogPosition(size);
@@ -113,43 +120,22 @@ gfx::Rect GetModalDialogBounds(views::Widget* widget,
@@ -112,43 +119,22 @@ gfx::Rect GetModalDialogBounds(views::Widget* widget,
position.set_y(position.y() -
widget->non_client_view()->frame_view()->GetInsets().top());
@ -94,7 +94,7 @@ index 0ffc333329d4d..91b7567c123ac 100644
}
void UpdateModalDialogPosition(views::Widget* widget,
@@ -160,15 +146,24 @@ void UpdateModalDialogPosition(views::Widget* widget,
@@ -159,15 +145,24 @@ void UpdateModalDialogPosition(views::Widget* widget,
return;
}
@ -121,14 +121,14 @@ index 0ffc333329d4d..91b7567c123ac 100644
return;
}
@@ -284,8 +279,13 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
@@ -297,8 +292,13 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
gfx::NativeView parent_view =
parent ? CurrentClient()->GetDialogHostView(parent) : nullptr;
parent ? CurrentBrowserModalClient()->GetDialogHostView(parent) : nullptr;
+ // Use with CEF windowless rendering.
+ gfx::AcceleratedWidget parent_widget = parent ?
+ CurrentClient()->GetModalDialogHost(parent)->GetAcceleratedWidget() :
+ gfx::kNullAcceleratedWidget;
+ gfx::AcceleratedWidget parent_widget =
+ parent ? CurrentBrowserModalClient()->GetModalDialogHost(parent)->
+ GetAcceleratedWidget() : gfx::kNullAcceleratedWidget;
views::Widget* widget =
- views::DialogDelegate::CreateDialogWidget(dialog, nullptr, parent_view);
+ views::DialogDelegate::CreateDialogWidget(dialog, nullptr, parent_view,
@ -136,31 +136,32 @@ index 0ffc333329d4d..91b7567c123ac 100644
widget->SetNativeWindowProperty(
views::kWidgetIdentifierKey,
const_cast<void*>(kConstrainedWindowWidgetIdentifier));
@@ -301,8 +301,7 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
if (!requires_positioning)
@@ -315,8 +315,7 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
return widget;
- ModalDialogHost* host =
- parent ? CurrentClient()->GetModalDialogHost(parent) : nullptr;
+ ModalDialogHost* host = CurrentClient()->GetModalDialogHost(parent);
ModalDialogHost* host =
- parent ? CurrentBrowserModalClient()->GetModalDialogHost(parent)
- : nullptr;
+ CurrentBrowserModalClient()->GetModalDialogHost(parent);
if (host) {
DCHECK_EQ(parent_view, host->GetHostView());
ModalDialogHostObserver* dialog_host_observer =
@@ -315,10 +314,17 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
std::unique_ptr<ModalDialogHostObserver> observer =
@@ -333,11 +332,17 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
views::Widget* ShowBrowserModal(std::unique_ptr<ui::DialogModel> dialog_model,
gfx::NativeWindow parent) {
+ gfx::NativeView parent_view =
+ parent ? CurrentClient()->GetDialogHostView(parent) : nullptr;
+ parent ? CurrentBrowserModalClient()->GetDialogHostView(parent) : nullptr;
+ // Use with CEF windowless rendering.
+ gfx::AcceleratedWidget parent_widget = parent ?
+ CurrentClient()->GetModalDialogHost(parent)->GetAcceleratedWidget() :
+ gfx::kNullAcceleratedWidget;
+ gfx::AcceleratedWidget parent_widget =
+ parent ? CurrentBrowserModalClient()->GetModalDialogHost(parent)->
+ GetAcceleratedWidget() : gfx::kNullAcceleratedWidget;
+
// TODO(crbug.com/41493925): Remove will_use_custom_frame once native frame
// dialogs support autosize.
bool will_use_custom_frame = views::DialogDelegate::CanSupportCustomFrame(
- parent ? CurrentClient()->GetDialogHostView(parent) : nullptr);
- parent ? CurrentBrowserModalClient()->GetDialogHostView(parent)
- : nullptr);
+ parent_view, parent_widget);
auto dialog = views::BubbleDialogModelHost::CreateModal(
std::move(dialog_model), ui::MODAL_TYPE_WINDOW, will_use_custom_frame);
@ -209,10 +210,10 @@ index 51ed6bcf6b540..c6e1161140655 100644
virtual gfx::Point GetDialogPosition(const gfx::Size& size) = 0;
// Returns whether a dialog currently about to be shown should be activated.
diff --git ui/views/window/dialog_delegate.cc ui/views/window/dialog_delegate.cc
index 18611879ee372..938dbba3e3a87 100644
index e1ac8ad60e63b..53816c9d82db0 100644
--- ui/views/window/dialog_delegate.cc
+++ ui/views/window/dialog_delegate.cc
@@ -91,10 +91,12 @@ DialogDelegate::DialogDelegate() {
@@ -85,10 +85,12 @@ DialogDelegate::DialogDelegate() {
// static
Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
gfx::NativeWindow context,
@ -227,7 +228,7 @@ index 18611879ee372..938dbba3e3a87 100644
widget->Init(std::move(params));
return widget;
}
@@ -103,16 +105,18 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
@@ -97,16 +99,18 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
Widget* DialogDelegate::CreateDialogWidget(
std::unique_ptr<WidgetDelegate> delegate,
gfx::NativeWindow context,
@ -250,26 +251,26 @@ index 18611879ee372..938dbba3e3a87 100644
#else
return true;
#endif
@@ -123,7 +127,8 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
@@ -117,7 +121,8 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
WidgetDelegate* delegate,
gfx::NativeWindow context,
gfx::NativeView parent,
- const gfx::Rect& bounds) {
+ const gfx::Rect& bounds,
+ gfx::AcceleratedWidget parent_widget) {
views::Widget::InitParams params(
Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET);
params.delegate = delegate;
@@ -131,7 +136,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
DialogDelegate* dialog = delegate->AsDialogDelegate();
views::Widget::InitParams params(
@@ -127,7 +132,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
params.bounds = bounds;
if (dialog)
- dialog->params_.custom_frame &= CanSupportCustomFrame(parent);
+ dialog->params_.custom_frame &= CanSupportCustomFrame(parent, parent_widget);
if (!dialog || dialog->use_custom_frame()) {
params.opacity = Widget::InitParams::WindowOpacity::kTranslucent;
@@ -144,6 +149,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
@@ -140,6 +145,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
}
params.context = context;
params.parent = parent;
@ -278,10 +279,10 @@ index 18611879ee372..938dbba3e3a87 100644
// Web-modal (ui::MODAL_TYPE_CHILD) dialogs with parents are marked as child
// widgets to prevent top-level window behavior (independent movement, etc).
diff --git ui/views/window/dialog_delegate.h ui/views/window/dialog_delegate.h
index 3cb2a5e22972d..1a716178e3f51 100644
index e5e145be9e14a..6663b8645ae7d 100644
--- ui/views/window/dialog_delegate.h
+++ ui/views/window/dialog_delegate.h
@@ -97,13 +97,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
@@ -99,13 +99,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
// your use case.
static Widget* CreateDialogWidget(std::unique_ptr<WidgetDelegate> delegate,
gfx::NativeWindow context,
@ -303,7 +304,7 @@ index 3cb2a5e22972d..1a716178e3f51 100644
// Returns the dialog widget InitParams for a given |context| or |parent|.
// If |bounds| is not empty, used to initially place the dialog, otherwise
@@ -111,7 +116,9 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
@@ -113,7 +118,9 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
static Widget::InitParams GetDialogWidgetInitParams(WidgetDelegate* delegate,
gfx::NativeWindow context,
gfx::NativeView parent,