| Index: ppapi/shared_impl/ppapi_preferences.cc
|
| diff --git a/ppapi/shared_impl/ppapi_preferences.cc b/ppapi/shared_impl/ppapi_preferences.cc
|
| index 1db53c0aef4e6120bfc0dd3cd53a04df99f3b736..c7bb0cbda88065a57dc027289f1fe18f841a3f49 100644
|
| --- a/ppapi/shared_impl/ppapi_preferences.cc
|
| +++ b/ppapi/shared_impl/ppapi_preferences.cc
|
| @@ -24,7 +24,10 @@ Preferences::Preferences(const webkit_glue::WebPreferences& prefs)
|
| number_of_cpu_cores(prefs.number_of_cpu_cores),
|
| is_3d_supported(prefs.flash_3d_enabled),
|
| is_stage3d_supported(prefs.flash_stage3d_enabled),
|
| - is_webgl_supported(prefs.experimental_webgl_enabled) {
|
| + // This determines both if webgl is supported (experimental_webgl_enabled)
|
| + // and if it runs in hardware (accelerated_plugins_enabled)
|
| + is_webgl_supported(prefs.experimental_webgl_enabled &&
|
| + prefs.accelerated_plugins_enabled) {
|
| }
|
|
|
| Preferences::~Preferences() {
|
|
|