Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index b29dd835f2ce05db6531b82c539962d527be5fd9..4d3284ecc56ef6fc0668771059f2f5db4da043f8 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -461,6 +461,9 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh, |
prefs.flash_stage3d_enabled = |
GpuProcessHost::gpu_enabled() && |
!command_line.HasSwitch(switches::kDisableFlashStage3d); |
+ prefs.flash_stage3d_baseline_enabled = |
+ GpuProcessHost::gpu_enabled() && |
+ !command_line.HasSwitch(switches::kDisableFlashStage3d); |
prefs.gl_multisampling_enabled = |
!command_line.HasSwitch(switches::kDisableGLMultisampling); |
@@ -582,8 +585,12 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh, |
prefs.experimental_webgl_enabled = false; |
if (blacklist_type & GPU_FEATURE_TYPE_FLASH3D) |
prefs.flash_3d_enabled = false; |
- if (blacklist_type & GPU_FEATURE_TYPE_FLASH_STAGE3D) |
+ if (blacklist_type & GPU_FEATURE_TYPE_FLASH_STAGE3D) { |
prefs.flash_stage3d_enabled = false; |
+ prefs.flash_stage3d_baseline_enabled = false; |
+ } |
+ if (blacklist_type & GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE) |
+ prefs.flash_stage3d_baseline_enabled = false; |
if (blacklist_type & GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS) |
prefs.accelerated_2d_canvas_enabled = false; |
if (blacklist_type & GPU_FEATURE_TYPE_MULTISAMPLING) |