Allow separately blacklisting Stage3D baseline mode.

content/browser/web_contents/web_contents_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 443 matching lines @@
 #else
       !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
 #endif
 
   prefs.flash_3d_enabled =
       GpuProcessHost::gpu_enabled() &&
       !command_line.HasSwitch(switches::kDisableFlash3d);
   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);
   prefs.privileged_webgl_extensions_enabled =
       command_line.HasSwitch(switches::kEnablePrivilegedWebGLExtensions);
   prefs.site_specific_quirks_enabled =
       !command_line.HasSwitch(switches::kDisableSiteSpecificQuirks);
   prefs.allow_file_access_from_file_urls =
       command_line.HasSwitch(switches::kAllowFileAccessFromFiles);
   prefs.show_composited_layer_borders =
@@ skipping 101 matching lines @@
   {  // Certain GPU features might have been blacklisted.
     GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
     DCHECK(gpu_data_manager);
     uint32 blacklist_type = gpu_data_manager->GetBlacklistedFeatures();
     if (blacklist_type & GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)
       prefs.accelerated_compositing_enabled = false;
     if (blacklist_type & GPU_FEATURE_TYPE_WEBGL)
       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)
       prefs.gl_multisampling_enabled = false;
     if (blacklist_type & GPU_FEATURE_TYPE_3D_CSS) {
       prefs.accelerated_compositing_for_3d_transforms_enabled = false;
       prefs.accelerated_compositing_for_animation_enabled = false;
     }
     if (blacklist_type & GPU_FEATURE_TYPE_ACCELERATED_VIDEO)
       prefs.accelerated_compositing_for_video_enabled = false;
@@ skipping 2919 matching lines @@
 
 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const {
   return browser_plugin_guest_.get();
 }
 
 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const {
   return browser_plugin_embedder_.get();
 }
 
 }  // namespace content