From ec122a9148036d7fe94c15dd302519abbc5492fd Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 15 Feb 2024 12:22:52 -0500 Subject: [PATCH] chrome: win: Fix crash on ShowProfileErrorDialog (fixes #3648) --- patch/patches/chrome_browser_dialogs_widget.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patch/patches/chrome_browser_dialogs_widget.patch b/patch/patches/chrome_browser_dialogs_widget.patch index 42662997e..d1c2ff707 100644 --- a/patch/patches/chrome_browser_dialogs_widget.patch +++ b/patch/patches/chrome_browser_dialogs_widget.patch @@ -12,7 +12,7 @@ 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 3daf40d463e32..dc3712bf6dc89 100644 +index 3daf40d463e32..2d84ad7a43c96 100644 --- components/constrained_window/constrained_window_views.cc +++ components/constrained_window/constrained_window_views.cc @@ -105,15 +105,24 @@ void UpdateModalDialogPosition(views::Widget* widget, @@ -106,9 +106,9 @@ index 3daf40d463e32..dc3712bf6dc89 100644 gfx::NativeView parent_view = parent ? CurrentClient()->GetDialogHostView(parent) : nullptr; + // Use with CEF windowless rendering. -+ gfx::AcceleratedWidget parent_widget = -+ parent ? gfx::kNullAcceleratedWidget : -+ CurrentClient()->GetModalDialogHost(parent)->GetAcceleratedWidget(); ++ gfx::AcceleratedWidget parent_widget = parent ? ++ CurrentClient()->GetModalDialogHost(parent)->GetAcceleratedWidget() : ++ gfx::kNullAcceleratedWidget; views::Widget* widget = - views::DialogDelegate::CreateDialogWidget(dialog, nullptr, parent_view); + views::DialogDelegate::CreateDialogWidget(dialog, nullptr, parent_view,