RandomHuman
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DOM] Make sure to exit fullscreen mode if popups are opened or focused.

This commit is contained in:
Fedor 2020-04-03 20:55:21 +03:00
parent d29e1bdafc
commit d93209d1f7
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/base/nsFocusManager.cpp
View File

@ -1261,6 +1261,15 @@ nsFocusManager::SetFocusInner(nsIContent* aNewContent, int32_t aFlags,
isElementInActiveWindow = (mActiveWindow && newRootWindow == mActiveWindow);
}
// Exit fullscreen if a website focuses another window
if (!isElementInActiveWindow && aFlags & FLAG_RAISE) {
if (nsIDocument* doc = mActiveWindow ? mActiveWindow->GetDoc() : nullptr) {
if (doc && doc->GetFullscreenElement()) {
nsIDocument::AsyncExitFullscreen(doc);
}
}
}
// Exit fullscreen if we're focusing a windowed plugin on a non-MacOSX
// system. We don't control event dispatch to windowed plugins on non-MacOSX,
// so we can't display the "Press ESC to leave fullscreen mode" warning on

6
embedding/components/windowwatcher/nsWindowWatcher.cpp
View File

@ -1297,6 +1297,12 @@ nsWindowWatcher::OpenWindowInternal(mozIDOMWindowProxy* aParent,
}
}
// If a website opens a popup exit DOM fullscreen
if (windowIsNew && aCalledFromJS && !hasChromeParent && !isCallerChrome &&
parentWindow) {
nsIDocument::AsyncExitFullscreen(parentWindow->GetDoc());
}
if (aForceNoOpener && windowIsNew) {
NS_RELEASE(*aResult);
}