Bug 1290987 - s/enable-prototype-webgl2/enable-webgl/ - r=jrmuizel,mrbkap CLOSED TREE
authorJeff Gilbert <jgilbert@mozilla.com>
Mon, 01 Aug 2016 12:43:37 -0700
changeset 349622 ab9b825256d592a32eeebe1381c576292d790a40
parent 349621 7c53e40a0d0391e4214f8ce7dd9fe744e00747b5
child 349623 bbf9eb08babaebd79a77c824a020f2b2b4e9f6dc
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, mrbkap
bugs1290987
milestone50.0a2
Bug 1290987 - s/enable-prototype-webgl2/enable-webgl/ - r=jrmuizel,mrbkap CLOSED TREE MozReview-Commit-ID: 3EArs8BLTpK
dom/canvas/test/webgl-mochitest/test_fuzzing_bugs.html
dom/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
dom/canvas/test/webgl-mochitest/webgl-util.js
dom/webidl/WebGL2RenderingContext.webidl
gfx/thebes/gfxPrefs.h
modules/libpref/init/all.js
--- a/dom/canvas/test/webgl-mochitest/test_fuzzing_bugs.html
+++ b/dom/canvas/test/webgl-mochitest/test_fuzzing_bugs.html
@@ -142,17 +142,17 @@ function run() {
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 
 try {
   var prefArrArr = [
     ['webgl.force-enabled', true],
-    ['webgl.enable-prototype-webgl2', true],
+    ['webgl.enable-webgl2', true],
   ];
   var prefEnv = {'set': prefArrArr};
   SpecialPowers.pushPrefEnv(prefEnv, run);
 } catch (e) {
   warning('No SpecialPowers, but trying WebGL2 anyway...');
   run();
 }
 </script>
--- a/dom/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
+++ b/dom/canvas/test/webgl-mochitest/test_webgl2_not_exposed.html
@@ -5,17 +5,17 @@
 <script src='/tests/SimpleTest/SimpleTest.js'></script>
 <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
 </head>
 <body>
 <script>
 
 function ShouldExpose() {
   try {
-    return SpecialPowers.getBoolPref('webgl.enable-prototype-webgl2');
+    return SpecialPowers.getBoolPref('webgl.enable-webgl2');
   } catch (e) {}
 
   return false;
 }
 
 function DoesExpose() {
   try {
     null instanceof WebGL2RenderingContext;
--- a/dom/canvas/test/webgl-mochitest/webgl-util.js
+++ b/dom/canvas/test/webgl-mochitest/webgl-util.js
@@ -83,17 +83,17 @@ WebGLUtil = (function() {
       onFinished();
     };
 
     try {
       var prefArrArr = [
         ['webgl.force-enabled', true],
         ['webgl.disable-angle', true],
         ['webgl.bypass-shader-validation', true],
-        ['webgl.enable-prototype-webgl2', true],
+        ['webgl.enable-webgl2', true],
       ];
       var prefEnv = {'set': prefArrArr};
       SpecialPowers.pushPrefEnv(prefEnv, run);
     } catch (e) {
       warning('No SpecialPowers, but trying WebGL2 anyway...');
       run();
     }
   }
--- a/dom/webidl/WebGL2RenderingContext.webidl
+++ b/dom/webidl/WebGL2RenderingContext.webidl
@@ -5,37 +5,37 @@
  *
  * The source for this IDL is found at https://www.khronos.org/registry/webgl/specs/latest/2.0
  * This IDL depends on WebGLRenderingContext.webidl
  */
 
 typedef long long GLint64; // Should this be int64?
 typedef unsigned long long GLuint64;
 
-[Pref="webgl.enable-prototype-webgl2"]
+[Pref="webgl.enable-webgl2"]
 interface WebGLQuery {
 };
 
-[Pref="webgl.enable-prototype-webgl2"]
+[Pref="webgl.enable-webgl2"]
 interface WebGLSampler {
 };
 
-[Pref="webgl.enable-prototype-webgl2"]
+[Pref="webgl.enable-webgl2"]
 interface WebGLSync {
 };
 
-[Pref="webgl.enable-prototype-webgl2"]
+[Pref="webgl.enable-webgl2"]
 interface WebGLTransformFeedback {
 };
 
-[Pref="webgl.enable-prototype-webgl2"]
+[Pref="webgl.enable-webgl2"]
 interface WebGLVertexArrayObject {
 };
 
-[Pref="webgl.enable-prototype-webgl2"]
+[Pref="webgl.enable-webgl2"]
 interface WebGL2RenderingContext : WebGLRenderingContext
 {
     const GLenum READ_BUFFER                                   = 0x0C02;
     const GLenum UNPACK_ROW_LENGTH                             = 0x0CF2;
     const GLenum UNPACK_SKIP_ROWS                              = 0x0CF3;
     const GLenum UNPACK_SKIP_PIXELS                            = 0x0CF4;
     const GLenum PACK_ROW_LENGTH                               = 0x0D02;
     const GLenum PACK_SKIP_ROWS                                = 0x0D03;
--- a/gfx/thebes/gfxPrefs.h
+++ b/gfx/thebes/gfxPrefs.h
@@ -548,17 +548,17 @@ private:
                 WebGLDisableFailIfMajorPerformanceCaveat, bool, false);
   DECL_GFX_PREF(Live, "webgl.disable-DOM-blit-uploads",
                 WebGLDisableDOMBlitUploads, bool, false);
 
   DECL_GFX_PREF(Live, "webgl.disabled",                        WebGLDisabled, bool, false);
 
   DECL_GFX_PREF(Live, "webgl.enable-draft-extensions",         WebGLDraftExtensionsEnabled, bool, false);
   DECL_GFX_PREF(Live, "webgl.enable-privileged-extensions",    WebGLPrivilegedExtensionsEnabled, bool, false);
-  DECL_GFX_PREF(Once, "webgl.enable-prototype-webgl2",         WebGL2Enabled, bool, false);
+  DECL_GFX_PREF(Live, "webgl.enable-webgl2",                   WebGL2Enabled, bool, true);
   DECL_GFX_PREF(Live, "webgl.force-enabled",                   WebGLForceEnabled, bool, false);
   DECL_GFX_PREF(Once, "webgl.force-layers-readback",           WebGLForceLayersReadback, bool, false);
   DECL_GFX_PREF(Live, "webgl.lose-context-on-memory-pressure", WebGLLoseContextOnMemoryPressure, bool, false);
   DECL_GFX_PREF(Live, "webgl.max-warnings-per-context",        WebGLMaxWarningsPerContext, uint32_t, 32);
   DECL_GFX_PREF(Live, "webgl.min_capability_mode",             WebGLMinCapabilityMode, bool, false);
   DECL_GFX_PREF(Live, "webgl.msaa-force",                      WebGLForceMSAA, bool, false);
   DECL_GFX_PREF(Live, "webgl.prefer-16bpp",                    WebGLPrefer16bpp, bool, false);
   DECL_GFX_PREF(Live, "webgl.restore-context-when-visible",    WebGLRestoreWhenVisible, bool, true);
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4416,21 +4416,17 @@ pref("webgl.restore-context-when-visible
 pref("webgl.max-warnings-per-context", 32);
 pref("webgl.enable-draft-extensions", false);
 pref("webgl.enable-privileged-extensions", false);
 pref("webgl.bypass-shader-validation", false);
 pref("webgl.disable-fail-if-major-performance-caveat", false);
 pref("webgl.disable-DOM-blit-uploads", false);
 pref("webgl.webgl2-compat-mode", false);
 
-#ifdef NIGHTLY_BUILD
-pref("webgl.enable-prototype-webgl2", true);
-#else
-pref("webgl.enable-prototype-webgl2", false);
-#endif
+pref("webgl.enable-webgl2", true);
 
 #ifdef RELEASE_BUILD
 // Keep this disabled on Release and Beta for now. (see bug 1171228)
 pref("webgl.enable-debug-renderer-info", false);
 #else
 pref("webgl.enable-debug-renderer-info", true);
 #endif