Revert "Runtime enablement of WebGL"

This reverts commit 0059fc7aaf5a8c141f7753b2574240e7dee53885.

Change-Id: I799965f86443f75a1e1576c54ffec31532c58ebe

3 files changed, 0 insertions, 26 deletions

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 8dadfc8..cec3b30 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -130,8 +130,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
 
     private static String sFactoryResetUrl;
 
-    private static boolean sWebGLAvailable;
-
     public static void initialize(final Context context) {
         sInstance = new BrowserSettings(context);
     }
@@ -278,8 +276,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
         settings.setSaveFormData(saveFormdata());
         settings.setUseWideViewPort(isWideViewport());
         settings.setAutoFillProfile(getAutoFillProfile());
-        setIsWebGLAvailable(settings.isWebGLAvailable());
-        settings.setWebGLEnabled(isWebGLAvailable() && isWebGLEnabled());
 
         String ua = mCustomUserAgents.get(settings);
         if (ua != null) {
@@ -846,10 +842,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
         return 1 + (mPrefs.getInt(PREF_INVERTED_CONTRAST, 0) / 10f);
     }
 
-    public boolean isWebGLEnabled() {
-        return mPrefs.getBoolean(PREF_ENABLE_WEBGL, true);
-    }
-
     // -----------------------------
     // getter/setters for privacy_security_preferences.xml
     // -----------------------------
@@ -942,14 +934,6 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
         return mPrefs.getString(PREF_VIDEO_PRELOAD, getDefaultVideoPreloadSetting());
     }
 
-    private static void setIsWebGLAvailable(boolean available) {
-        sWebGLAvailable = available;
-    }
-
-    public static boolean isWebGLAvailable() {
-        return sWebGLAvailable;
-    }
-
     // -----------------------------
     // getter/setters for browser recovery
     // -----------------------------
diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java
index 594bd81..405d893 100644
--- a/src/com/android/browser/PreferenceKeys.java
+++ b/src/com/android/browser/PreferenceKeys.java
@@ -84,7 +84,6 @@ public interface PreferenceKeys {
     // ----------------------
     static final String PREF_ENABLE_QUICK_CONTROLS = "enable_quick_controls";
     static final String PREF_FULLSCREEN = "fullscreen";
-    static final String PREF_ENABLE_WEBGL = "enable_webgl";
 
     // ----------------------
     // Keys for privacy_security_preferences.xml
diff --git a/src/com/android/browser/preferences/LabPreferencesFragment.java b/src/com/android/browser/preferences/LabPreferencesFragment.java
index 8d33c95..222b5fa 100644
--- a/src/com/android/browser/preferences/LabPreferencesFragment.java
+++ b/src/com/android/browser/preferences/LabPreferencesFragment.java
@@ -17,10 +17,8 @@
 package com.android.browser.preferences;
 
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
 
 import com.android.browser.BrowserSettings;
 import com.android.browser.PreferenceKeys;
@@ -34,12 +32,5 @@ public class LabPreferencesFragment extends PreferenceFragment {
         super.onCreate(savedInstanceState);
         // Load the XML preferences file
         addPreferencesFromResource(R.xml.lab_preferences);
-
-        if (!BrowserSettings.isWebGLAvailable()) {
-            CheckBoxPreference webGL = (CheckBoxPreference)
-                findPreference(PreferenceKeys.PREF_ENABLE_WEBGL);
-            PreferenceScreen screen = getPreferenceScreen();
-            screen.removePreference(webGL);
-        }
     }
 }