aw: Only enable webgl on hardware webview

android_webview/native/aw_settings.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/aw_settings.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
-#include "base/command_line.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/common/content_switches.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/web_preferences.h"
 #include "jni/AwSettings_jni.h"
 #include "ui/gfx/font_render_params_linux.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using content::RendererPreferences;
 using content::WebPreferences;
@@ skipping 78 matching lines @@
     return data ? data->settings_ : NULL;
   }
 
  private:
   AwSettings* settings_;
 };
 
 AwSettings::AwSettings(JNIEnv* env, jobject obj, jlong web_contents)
     : WebContentsObserver(
           reinterpret_cast<content::WebContents*>(web_contents)),
-      accelerated_2d_canvas_disabled_by_switch_(
-          CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisableAccelerated2dCanvas)),
       renderer_prefs_initialized_(false),
       aw_settings_(env, obj) {
   reinterpret_cast<content::WebContents*>(web_contents)->
       SetUserData(kAwSettingsUserDataKey, new AwSettingsUserData(this));
 }
 
 AwSettings::~AwSettings() {
   if (web_contents()) {
     web_contents()->SetUserData(kAwSettingsUserDataKey, NULL);
   }
@@ skipping 277 matching lines @@
   web_prefs->viewport_meta_zero_values_quirk = support_quirks;
   web_prefs->clobber_user_agent_initial_scale_quirk = support_quirks;
   web_prefs->ignore_main_frame_overflow_hidden_quirk = support_quirks;
   web_prefs->report_screen_size_in_physical_pixels_quirk = support_quirks;
 
   web_prefs->password_echo_enabled =
       Java_AwSettings_getPasswordEchoEnabledLocked(env, obj);
   web_prefs->spatial_navigation_enabled =
       Java_AwSettings_getSpatialNavigationLocked(env, obj);
 
+  bool enable_supported_hardware_accelerated_features =
+      Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked(
+                env, obj);
+
+  bool accelerated_2d_canvas_enabled_by_switch =
+      web_prefs->accelerated_2d_canvas_enabled;

[no sievers, 2014/07/09 22:59:26]

So before we specifically looked at the cmdline for disabling accel. canvas.
After we don't anymore. Is that ok?

[boliu, 2014/07/09 23:03:05]

We do still take it into account. This is called from OverrideWebkitPrefs which
is *after* content already poplulates what it thinks should be the prefs. So if
either webgl or canvas should be disabled by content switches, it would be false
by this point. That's why we are and-ing the these with our setting.

This just looks weird for canvas because we had a hack to enable/disable it with
size preference rather than the enable/disable preference

   web_prefs->accelerated_2d_canvas_enabled = true;
-  if (accelerated_2d_canvas_disabled_by_switch_ ||
-      !Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked(
-          env, obj)) {
+  if (!accelerated_2d_canvas_enabled_by_switch ||
+      !enable_supported_hardware_accelerated_features) {
     // Any canvas smaller than this will fallback to software. Abusing this
     // slightly to turn canvas off without changing
     // accelerated_2d_canvas_enabled, which also affects compositing mode.
     // Using 100M instead of max int to avoid overflows.
     web_prefs->minimum_accelerated_2d_canvas_size = 100 * 1000 * 1000;
   }
+  web_prefs->experimental_webgl_enabled =
+      web_prefs->experimental_webgl_enabled &&
+      enable_supported_hardware_accelerated_features;
 
   web_prefs->allow_displaying_insecure_content =
       Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj);
   web_prefs->allow_running_insecure_content =
       Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj);
 
   web_prefs->disallow_fullscreen_for_non_media_elements = true;
 }
 
 static jlong Init(JNIEnv* env,
                   jobject obj,
                   jlong web_contents) {
   AwSettings* settings = new AwSettings(env, obj, web_contents);
   return reinterpret_cast<intptr_t>(settings);
 }
 
 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview