Bug 1823350 - Unify how we identify PiP windows on Linux/Windows. r=m…

…conley,stransky This way we don't end up without titlebars in other alwaysontop windows. Differential Revision: https://phabricator.services.mozilla.com/D172992
dothq · Mar 20, 2023 · 2838780 · 2838780
1 parent 82623a7
commit 2838780
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
@@ -18,12 +18,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 import { Rect, Point } from "resource://gre/modules/Geometry.sys.mjs";
 
 const PLAYER_URI = "chrome://global/content/pictureinpicture/player.xhtml";
-var PLAYER_FEATURES =
-  "chrome,titlebar=yes,alwaysontop,lockaspectratio,resizable";
-/* Don't use dialog on Gtk as it adds extra border and titlebar to PIP window */
-if (!AppConstants.MOZ_WIDGET_GTK) {
-  PLAYER_FEATURES += ",dialog";
-}
+const PLAYER_FEATURES = "chrome,alwaysontop,lockaspectratio,resizable,dialog";
 const WINDOW_TYPE = "Toolkit:PictureInPicture";
 const PIP_ENABLED_PREF = "media.videocontrols.picture-in-picture.enabled";
 const TOGGLE_ENABLED_PREF =

diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
@@ -579,28 +579,16 @@ nsresult nsAppShellService::JustCreateTopWindow(
   if (aChromeMask & nsIWebBrowserChrome::CHROME_REMOTE_WINDOW)
     widgetInitData.mHasRemoteContent = true;
 
-#ifdef MOZ_WIDGET_GTK
-  // Linux/Gtk PIP window support. It's Chrome Toplevel window, always on top
+#if defined(MOZ_WIDGET_GTK) || defined(XP_WIN)
+  // Windows/Gtk PIP window support. It's Chrome dialog window, always on top
   // and without any bar.
   uint32_t pipMask = nsIWebBrowserChrome::CHROME_ALWAYS_ON_TOP |
                      nsIWebBrowserChrome::CHROME_OPENAS_CHROME |
                      nsIWebBrowserChrome::CHROME_WINDOW_RESIZE;
   uint32_t barMask = nsIWebBrowserChrome::CHROME_MENUBAR |
                      nsIWebBrowserChrome::CHROME_TOOLBAR |
                      nsIWebBrowserChrome::CHROME_LOCATIONBAR |
-                     nsIWebBrowserChrome::CHROME_STATUSBAR;
-  if (widgetInitData.mWindowType == widget::WindowType::TopLevel &&
-      ((aChromeMask & pipMask) == pipMask) && !(aChromeMask & barMask)) {
-    widgetInitData.mPIPWindow = true;
-  }
-#elif defined(XP_WIN)
-  // Windows PIP window support. It's Chrome dialog window, always on top
-  // and without any bar.
-  uint32_t pipMask = nsIWebBrowserChrome::CHROME_ALWAYS_ON_TOP |
-                     nsIWebBrowserChrome::CHROME_OPENAS_CHROME;
-  uint32_t barMask = nsIWebBrowserChrome::CHROME_MENUBAR |
-                     nsIWebBrowserChrome::CHROME_TOOLBAR |
-                     nsIWebBrowserChrome::CHROME_LOCATIONBAR |
+                     nsIWebBrowserChrome::CHROME_TITLEBAR |
                      nsIWebBrowserChrome::CHROME_STATUSBAR;
   if (widgetInitData.mWindowType == widget::WindowType::Dialog &&
       ((aChromeMask & pipMask) == pipMask) && !(aChromeMask & barMask)) {