From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- widget/headless/HeadlessWidget.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'widget/headless/HeadlessWidget.cpp') diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp index 083d026d3c..419b3bf940 100644 --- a/widget/headless/HeadlessWidget.cpp +++ b/widget/headless/HeadlessWidget.cpp @@ -160,10 +160,9 @@ void HeadlessWidget::GetCompositorWidgetInitData( nsIWidget* HeadlessWidget::GetTopLevelWidget() { return mTopLevel; } void HeadlessWidget::RaiseWindow() { - MOZ_ASSERT(mWindowType == WindowType::TopLevel || - mWindowType == WindowType::Dialog || - mWindowType == WindowType::Sheet, - "Raising a non-toplevel window."); + MOZ_ASSERT( + mWindowType == WindowType::TopLevel || mWindowType == WindowType::Dialog, + "Raising a non-toplevel window."); // Do nothing if this is the currently active window. RefPtr activeWindow = GetActiveWindow(); @@ -204,7 +203,7 @@ void HeadlessWidget::Show(bool aState) { // so we don't focus them by default. if (aState && !mAlwaysOnTop && (mWindowType == WindowType::TopLevel || - mWindowType == WindowType::Dialog || mWindowType == WindowType::Sheet)) { + mWindowType == WindowType::Dialog)) { RaiseWindow(); } -- cgit v1.2.3