Bug 1608189 - Allow WebRender captures on beta/release if pref is set. r=jrmuizel,mconley

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

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

browser/base/content/browser-graphics-utils.js

@@ -11,6 +11,13 @@
 var gGfxUtils = {
   _isRecording: false,
   _isTransactionLogging: false,
+
+  init() {
+    if (Services.prefs.getBoolPref("gfx.webrender.enable-capture")) {
+      document.getElementById("wrCaptureCmd").removeAttribute("disabled");
+    }
+  },
+
   /**
    * Toggle composition recording for the current window.
    */

browser/base/content/browser-sets.inc

@@ -101,8 +101,8 @@
     <command id="History:UndoCloseTab" oncommand="undoCloseTab();"/>
     <command id="History:UndoCloseWindow" oncommand="undoCloseWindow();"/>
 
+    <command id="wrCaptureCmd" oncommand="gGfxUtils.webrenderCapture();" disabled="true"/>
 #ifdef NIGHTLY_BUILD
-    <command id="wrCaptureCmd" oncommand="gGfxUtils.webrenderCapture();"/>
     <command id="windowRecordingCmd" oncommand="gGfxUtils.toggleWindowRecording();"/>
     <command id="wrTransactionLoggingCmd" oncommand="gGfxUtils.toggleTransactionLogging();"/>
 #endif
@@ -327,7 +327,6 @@
 #expand    <key id="key_selectTab8" oncommand="gBrowser.selectTabAtIndex(7, event);" key="8" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
 #expand    <key id="key_selectLastTab" oncommand="gBrowser.selectTabAtIndex(-1, event);" key="9" modifiers="__NUM_SELECT_TAB_MODIFIER__"/>
 
-#ifdef NIGHTLY_BUILD
     <key id="key_wrCaptureCmd"
 #ifdef XP_MACOSX
     key="3" modifiers="control,shift"
@@ -335,6 +334,7 @@
     key="#" modifiers="control"
 #endif
     command="wrCaptureCmd"/>
+#ifdef NIGHTLY_BUILD
     <key id="key_windowRecordingCmd"
 #ifdef XP_MACOSX
     key="4" modifiers="control,shift"

browser/base/content/browser.js

@@ -225,14 +225,11 @@ XPCOMUtils.defineLazyScriptGetter(
   "SearchOneOffs",
   "chrome://browser/content/search/search-one-offs.js"
 );
-if (AppConstants.NIGHTLY_BUILD) {
-  XPCOMUtils.defineLazyScriptGetter(
-    this,
-    "gGfxUtils",
-    "chrome://browser/content/browser-graphics-utils.js"
-  );
-}
-
+XPCOMUtils.defineLazyScriptGetter(
+  this,
+  "gGfxUtils",
+  "chrome://browser/content/browser-graphics-utils.js"
+);
 XPCOMUtils.defineLazyScriptGetter(
   this,
   "pktUI",
@@ -2312,6 +2309,10 @@ var gBrowserInit = {
       });
     }
 
+    scheduleIdleTask(() => {
+      gGfxUtils.init();
+    });
+
     // This should always go last, since the idle tasks (except for the ones with
     // timeouts) should execute in order. Note that this observer notification is
     // not guaranteed to fire, since the window could close before we get here.

modules/libpref/init/StaticPrefList.yaml

@@ -3855,6 +3855,15 @@
   value: false
   mirror: always
 
+- name: gfx.webrender.enable-capture
+  type: bool
+#ifdef NIGHTLY_BUILD
+  value: true
+#else
+  value: false
+#endif
+  mirror: once
+
 - name: gfx.webrender.dl.dump-parent
   type: RelaxedAtomicBool
   value: false