Bug 628403 - rename webgl.prefer_gl to webgl.prefer-native-gl - r=vlad, a=joe
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 28 Jan 2011 21:12:25 -0500
changeset 61567 828decbcc564718527dc890da335564cbd627701
parent 61566 2a7ac44076692b40386defdc1b2f7cf70019f33c
child 61568 faa8b3f0c677cadaf90c1e9dc17a613a9fb9d1d7
push id1
push userroot
push dateTue, 10 Dec 2013 15:46:25 +0000
reviewersvlad, joe
bugs628403
milestone2.0b11pre
Bug 628403 - rename webgl.prefer_gl to webgl.prefer-native-gl - r=vlad, a=joe
content/canvas/src/WebGLContext.cpp
content/canvas/test/webgl/test_webgl_conformance_test_suite.html
modules/libpref/src/init/all.js
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -399,18 +399,18 @@ WebGLContext::SetDimensions(PRInt32 widt
     mVerbose = verbose;
 
     // Get some prefs for some preferred/overriden things
     PRBool forceOSMesa = PR_FALSE;
     PRBool preferEGL = PR_FALSE;
     PRBool preferOpenGL = PR_FALSE;
     PRBool forceEnabled = PR_FALSE;
     prefService->GetBoolPref("webgl.force_osmesa", &forceOSMesa);
-    prefService->GetBoolPref("webgl.prefer_egl", &preferEGL);
-    prefService->GetBoolPref("webgl.prefer_gl", &preferOpenGL);
+    prefService->GetBoolPref("webgl.prefer-egl", &preferEGL);
+    prefService->GetBoolPref("webgl.prefer-native-gl", &preferOpenGL);
     prefService->GetBoolPref("webgl.force-enabled", &forceEnabled);
     if (PR_GetEnv("MOZ_WEBGL_PREFER_EGL")) {
         preferEGL = PR_TRUE;
     }
 
     // Ask GfxInfo about what we should use
     PRBool useOpenGL = PR_TRUE;
     PRBool useANGLE = PR_TRUE;
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -52,24 +52,24 @@ function start() {
 
   function getForceEnabled() {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     return prefSvc().getBoolPref("webgl.force-enabled");
   }
 
   function setPreferGL(value) {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-    prefSvc().setBoolPref("webgl.prefer_gl", value);
+    prefSvc().setBoolPref("webgl.prefer-native-gl", value);
   }
 
   function getPreferGL() {
     netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     var retval = false;
     try {
-      retval = prefSvc().getBoolPref("webgl.prefer_gl");
+      retval = prefSvc().getBoolPref("webgl.prefer-native-gl");
     } catch (ex) { }
     return retval;
   }
 
   function restoreOldPrefs() {
     setForceEnabled(saved_force_enabled);
     setPreferGL(saved_prefer_gl);
   }
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3209,16 +3209,17 @@ pref("image.mem.max_bytes_for_sync_decod
 
 // WebGL prefs
 pref("webgl.force-enabled", false);
 pref("webgl.disabled", false);
 pref("webgl.shader_validator", true);
 pref("webgl.force_osmesa", false);
 pref("webgl.osmesalib", "");
 pref("webgl.verbose", false);
+pref("webgl.prefer-native-gl", false);
 
 #ifdef XP_WIN
 #ifndef WINCE
 // The default TCP send window on Windows is too small, and autotuning only occurs on receive
 pref("network.tcp.sendbuffer", 131072);
 #endif
 #endif