Allow separately blacklisting Stage3D baseline mode.
Some older drivers should support Stage3D constrained mode, not baseline mode, so add blacklist entries for that.
BUG=172771
Review URL: https://chromiumcodereview.appspot.com/12079111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181836 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b29dd835..4d3284e 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -461,6 +461,9 @@
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 @@
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)
