Bug 1535748 - Remove NIGHTLY_BUILD build-time switches for Picture-in-Picture. r=jaws

Differential Revision: https://phabricator.services.mozilla.com/D23948

--HG--
extra : moz-landing-system : lando

browser/app/profile/firefox.js

@@ -1512,10 +1512,6 @@ pref("media.autoplay.block-webaudio", true);
 pref("media.autoplay.block-webaudio", false);
 #endif
 
-#ifdef NIGHTLY_BUILD
-pref("media.videocontrols.picture-in-picture.enabled", false);
-#endif
-
 // Play with different values of the decay time and get telemetry,
 // 0 means to randomize (and persist) the experiment value in users' profiles,
 // -1 means no experiment is run and we use the preferred value for frecency (6h)

browser/base/content/nsContextMenu.js

@@ -679,7 +679,7 @@ nsContextMenu.prototype = {
     this.showItem("context-media-showcontrols", onMedia && !this.target.controls);
     this.showItem("context-media-hidecontrols", this.target.controls && (this.onVideo || (this.onAudio && !this.inSyntheticDoc)));
     this.showItem("context-video-fullscreen", this.onVideo && !this.target.ownerDocument.fullscreen);
-    if (AppConstants.NIGHTLY_BUILD) {
+    {
       let shouldDisplay = Services.prefs.getBoolPref("media.videocontrols.picture-in-picture.enabled") &&
                           this.onVideo &&
                           !this.target.ownerDocument.fullscreen;

modules/libpref/init/all.js

@@ -444,6 +444,8 @@ pref("media.peerconnection.sdp.rust.enabled", false);
 pref("media.peerconnection.sdp.rust.compare", false);
 #endif
 
+pref("media.videocontrols.picture-in-picture.enabled", false);
+
 pref("media.webrtc.debug.trace_mask", 0);
 pref("media.webrtc.debug.multi_log", false);
 pref("media.webrtc.debug.log_file", "");

toolkit/actors/moz.build

@@ -28,6 +28,7 @@ FINAL_TARGET_FILES.actors += [
     'FindBarChild.jsm',
     'FinderChild.jsm',
     'KeyPressEventModelCheckerChild.jsm',
+    'PictureInPictureChild.jsm',
     'PopupBlockingChild.jsm',
     'PrintingChild.jsm',
     'PurgeSessionHistoryChild.jsm',
@@ -40,8 +41,3 @@ FINAL_TARGET_FILES.actors += [
     'WebNavigationChild.jsm',
     'ZoomChild.jsm',
 ]
-
-if CONFIG['NIGHTLY_BUILD']:
-    FINAL_TARGET_FILES.actors += [
-        'PictureInPictureChild.jsm',
-    ]

toolkit/components/moz.build

@@ -49,6 +49,7 @@ DIRS += [
     'passwordmgr',
     'perf',
     'perfmonitoring',
+    'pictureinpicture',
     'places',
     'processsingleton',
     'promiseworker',
@@ -87,9 +88,6 @@ if CONFIG['MOZ_BUILD_APP'] != 'mobile/android':
     if CONFIG['NS_PRINTING']:
         DIRS += ['printing']
 
-    if CONFIG['NIGHTLY_BUILD']:
-        DIRS += ['pictureinpicture']
-
 if CONFIG['BUILD_CTYPES']:
     DIRS += ['ctypes']
 

toolkit/modules/ActorManagerParent.jsm

@@ -97,7 +97,6 @@ var EXPORTED_SYMBOLS = ["ActorManagerParent"];
 
 const {ExtensionUtils} = ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
 const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const {DefaultMap} = ExtensionUtils;
 
@@ -217,6 +216,19 @@ let ACTORS = {
     },
   },
 
+  PictureInPicture: {
+    child: {
+      module: "resource://gre/actors/PictureInPictureChild.jsm",
+      events: {
+        "MozTogglePictureInPicture": {capture: true},
+      },
+
+      messages: [
+        "PictureInPicture:SetupPlayer",
+      ],
+    },
+  },
+
   PopupBlocking: {
     child: {
       module: "resource://gre/actors/PopupBlockingChild.jsm",
@@ -348,21 +360,6 @@ let ACTORS = {
   },
 };
 
-if (AppConstants.NIGHTLY_BUILD) {
-  ACTORS.PictureInPicture = {
-    child: {
-      module: "resource://gre/actors/PictureInPictureChild.jsm",
-      events: {
-        "MozTogglePictureInPicture": {capture: true},
-      },
-
-      messages: [
-        "PictureInPicture:SetupPlayer",
-      ],
-    },
-  };
-}
-
 class ActorSet {
   constructor(group, actorSide) {
     this.group = group;

toolkit/themes/shared/media/videocontrols.css

@@ -424,7 +424,6 @@
   background-image: url(chrome://global/skin/media/error.png);
 }
 
-%ifdef NIGHTLY_BUILD
 .statusIcon[type="pictureInPicture"] {
   min-width: 84px;
   min-height: 84px;
@@ -433,7 +432,6 @@
   fill: #fff;
   stroke: #fff;
 }
-%endif
 
 /* Overlay Play button */
 .clickToPlay {