Index: android_webview/native/aw_settings.cc |
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc |
index e2379ed5586eeac603d30df2a8e58c0f278336c0..e855cf5dca931b1d9eccc3447b021b5abb6a17f7 100644 |
--- a/android_webview/native/aw_settings.cc |
+++ b/android_webview/native/aw_settings.cc |
@@ -326,10 +326,16 @@ void AwSettings::PopulateWebPreferencesLocked( |
web_prefs->spatial_navigation_enabled = |
Java_AwSettings_getSpatialNavigationLocked(env, obj); |
- web_prefs->accelerated_2d_canvas_enabled = |
- !accelerated_2d_canvas_disabled_by_switch_ && |
- Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked( |
- env, obj); |
+ web_prefs->accelerated_2d_canvas_enabled = true; |
+ if (accelerated_2d_canvas_disabled_by_switch_ || |
+ !Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked( |
+ env, obj)) { |
+ // 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. |
+ web_prefs->minimum_accelerated_2d_canvas_size = |
+ std::numeric_limits<int>::max(); |
aelias_OOO_until_Jul13
2014/03/25 23:58:16
INT_MAX is prone to strange bugs because you canno
|
+ } |
} |
static jlong Init(JNIEnv* env, |