Connect up flash blacklist entries to GetSettingInt

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 410 matching lines @@
   prefs.databases_enabled =
       !command_line.HasSwitch(switches::kDisableDatabases);
   prefs.webaudio_enabled =
       !command_line.HasSwitch(switches::kDisableWebAudio);
 
   prefs.experimental_webgl_enabled =
       GpuProcessHost::gpu_enabled() &&
       !command_line.HasSwitch(switches::kDisable3DAPIs) &&
       !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
 
+  prefs.flash_3d_enabled = prefs.flash_stage3d_enabled =
+      GpuProcessHost::gpu_enabled();
+
   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 =
       command_line.HasSwitch(switches::kShowCompositedLayerBorders);
@@ skipping 61 matching lines @@
       command_line.HasSwitch(switches::kEnablePerTilePainting);
 
   {  // Certain GPU features might have been blacklisted.
     GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
     DCHECK(gpu_data_manager);
     uint32 blacklist_type = gpu_data_manager->GetGpuFeatureType();
     if (blacklist_type & content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)
       prefs.accelerated_compositing_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_WEBGL)
       prefs.experimental_webgl_enabled = false;
+    if (blacklist_type & content::GPU_FEATURE_TYPE_FLASH3D)
+      prefs.flash_3d_enabled = false;
+    if (blacklist_type & content::GPU_FEATURE_TYPE_FLASH_STAGE3D)
+      prefs.flash_stage3d_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)
       prefs.accelerated_2d_canvas_enabled = false;
     if (blacklist_type & content::GPU_FEATURE_TYPE_MULTISAMPLING)
       prefs.gl_multisampling_enabled = false;
 
     // Accelerated video and animation are slower than regular when using a
     // software 3d rasterizer. 3D CSS may also be too slow to be worthwhile.
     if (gpu_data_manager->ShouldUseSoftwareRendering()) {
       prefs.accelerated_video_enabled = false;
       prefs.accelerated_animation_enabled = false;
@@ skipping 2548 matching lines @@
       browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = browser_plugin_host()->instance_id();
   int embedder_process_id =
       embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
   if (embedder_process_id != -1) {
     *embedder_channel_name =
         StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
                      embedder_process_id);
   }
 }