author | Sebastian Hengst <archaeopteryx@coole-files.de> |
Fri, 20 Oct 2017 00:28:03 +0200 | |
changeset 387199 | d86b238b5db553056162c336aac62a213c255329 |
parent 387198 | 8dbda4160d4085b6daaa68a9bd318ec15cee31ce |
child 387200 | 4b2c76feaf08bb31da943ecb1e3520f7b74e50aa |
push id | 32715 |
push user | acraciun@mozilla.com |
push date | Fri, 20 Oct 2017 09:04:45 +0000 |
treeherder | mozilla-central@be030533c5af [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | backout |
bugs | 1406032 |
milestone | 58.0a1 |
backs out | 4f7b6f90f1ddb13c817d8d5da3cad1eefa8629e5 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/widget/cocoa/nsCocoaWindow.mm +++ b/widget/cocoa/nsCocoaWindow.mm @@ -880,21 +880,19 @@ nsCocoaWindow::Show(bool bState) object:@"org.mozilla.gecko.PopupWindow"]; } // If a parent window was supplied and this is a popup at the parent // level, set its child window. This will cause the child window to // appear above the parent and move when the parent does. Setting this // needs to happen after the _setWindowNumber calls above, otherwise the // window doesn't focus properly. - if (nativeParentWindow && mPopupLevel == ePopupLevelParent) { + if (nativeParentWindow && mPopupLevel == ePopupLevelParent) [nativeParentWindow addChildWindow:mWindow ordered:NSWindowAbove]; - [mWindow setLevel:NSPopUpMenuWindowLevel]; - } } else { NS_OBJC_BEGIN_TRY_ABORT_BLOCK; if (mWindowType == eWindowType_toplevel && [mWindow respondsToSelector:@selector(setAnimationBehavior:)]) { NSWindowAnimationBehavior behavior; if (mIsAnimationSuppressed) { behavior = NSWindowAnimationBehaviorNone; @@ -1372,17 +1370,16 @@ nsCocoaWindow::HideWindowChrome(bool aSh // Reparent the content view. [mWindow setContentView:contentView]; [contentView release]; // Reparent child windows. enumerator = [childWindows objectEnumerator]; while ((child = [enumerator nextObject])) { [mWindow addChildWindow:child ordered:NSWindowAbove]; - [mWindow setLevel:NSPopUpMenuWindowLevel]; } // Show the new window. if (isVisible) { bool wasAnimationSuppressed = mIsAnimationSuppressed; mIsAnimationSuppressed = true; Show(true); mIsAnimationSuppressed = wasAnimationSuppressed;