summaryrefslogtreecommitdiffstats
path: root/chromium/ppapi/shared_impl/ppapi_preferences.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ppapi/shared_impl/ppapi_preferences.cc')
-rw-r--r--chromium/ppapi/shared_impl/ppapi_preferences.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/chromium/ppapi/shared_impl/ppapi_preferences.cc b/chromium/ppapi/shared_impl/ppapi_preferences.cc
index fd2ee97370a..662c8ebd34a 100644
--- a/chromium/ppapi/shared_impl/ppapi_preferences.cc
+++ b/chromium/ppapi/shared_impl/ppapi_preferences.cc
@@ -12,8 +12,8 @@ Preferences::Preferences()
number_of_cpu_cores(0),
is_3d_supported(true),
is_stage3d_supported(false),
- is_stage3d_baseline_supported(false) {
-}
+ is_stage3d_baseline_supported(false),
+ is_accelerated_video_decode_enabled(false) {}
Preferences::Preferences(const WebPreferences& prefs)
: standard_font_family_map(prefs.standard_font_family_map),
@@ -26,14 +26,10 @@ Preferences::Preferences(const WebPreferences& prefs)
is_3d_supported(prefs.flash_3d_enabled),
is_stage3d_supported(prefs.flash_stage3d_enabled),
is_stage3d_baseline_supported(prefs.flash_stage3d_baseline_enabled),
- // This determines both if webgl is supported (experimental_webgl_enabled)
- // and if it runs in hardware
- // (accelerated_compositing_for_plugins_enabled)
- is_webgl_supported(prefs.experimental_webgl_enabled &&
- prefs.accelerated_compositing_for_plugins_enabled) {
-}
+ is_webgl_supported(prefs.experimental_webgl_enabled),
+ is_accelerated_video_decode_enabled(
+ prefs.pepper_accelerated_video_decode_enabled) {}
-Preferences::~Preferences() {
-}
+Preferences::~Preferences() {}
} // namespace ppapi