Allow separately blacklisting Stage3D baseline mode.

content/browser/gpu/gpu_util.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/gpu/gpu_util.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/version.h"
 #include "content/browser/gpu/gpu_blacklist.h"
 #include "content/public/common/content_switches.h"
 #include "ui/gl/gl_switches.h"
 
 namespace content {
 namespace {
 
 const char kGpuFeatureNameAccelerated2dCanvas[] = "accelerated_2d_canvas";
 const char kGpuFeatureNameAcceleratedCompositing[] = "accelerated_compositing";
 const char kGpuFeatureNameWebgl[] = "webgl";
 const char kGpuFeatureNameMultisampling[] = "multisampling";
 const char kGpuFeatureNameFlash3d[] = "flash_3d";
 const char kGpuFeatureNameFlashStage3d[] = "flash_stage3d";
+const char kGpuFeatureNameFlashStage3dBaseline[] = "flash_stage3d_baseline";
 const char kGpuFeatureNameTextureSharing[] = "texture_sharing";
 const char kGpuFeatureNameAcceleratedVideoDecode[] = "accelerated_video_decode";
 const char kGpuFeatureName3dCss[] = "3d_css";
 const char kGpuFeatureNameAcceleratedVideo[] = "accelerated_video";
 const char kGpuFeatureNamePanelFitting[] = "panel_fitting";
 const char kGpuFeatureNameForceCompositingMode[] = "force_compositing_mode";
 const char kGpuFeatureNameAll[] = "all";
 const char kGpuFeatureNameUnknown[] = "unknown";
 
 enum GpuFeatureStatus {
@@ skipping 55 matching lines @@
   if (feature_string == kGpuFeatureNameAcceleratedCompositing)
     return GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING;
   if (feature_string == kGpuFeatureNameWebgl)
     return GPU_FEATURE_TYPE_WEBGL;
   if (feature_string == kGpuFeatureNameMultisampling)
     return GPU_FEATURE_TYPE_MULTISAMPLING;
   if (feature_string == kGpuFeatureNameFlash3d)
     return GPU_FEATURE_TYPE_FLASH3D;
   if (feature_string == kGpuFeatureNameFlashStage3d)
     return GPU_FEATURE_TYPE_FLASH_STAGE3D;
+  if (feature_string == kGpuFeatureNameFlashStage3dBaseline)
+    return GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE;
   if (feature_string == kGpuFeatureNameTextureSharing)
     return GPU_FEATURE_TYPE_TEXTURE_SHARING;
   if (feature_string == kGpuFeatureNameAcceleratedVideoDecode)
     return GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE;
   if (feature_string == kGpuFeatureName3dCss)
     return GPU_FEATURE_TYPE_3D_CSS;
   if (feature_string == kGpuFeatureNameAcceleratedVideo)
     return GPU_FEATURE_TYPE_ACCELERATED_VIDEO;
   if (feature_string == kGpuFeatureNamePanelFitting)
     return GPU_FEATURE_TYPE_PANEL_FITTING;
@@ skipping 14 matching lines @@
     if (type & GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING)
       matches.push_back(kGpuFeatureNameAcceleratedCompositing);
     if (type & GPU_FEATURE_TYPE_WEBGL)
       matches.push_back(kGpuFeatureNameWebgl);
     if (type & GPU_FEATURE_TYPE_MULTISAMPLING)
       matches.push_back(kGpuFeatureNameMultisampling);
     if (type & GPU_FEATURE_TYPE_FLASH3D)
       matches.push_back(kGpuFeatureNameFlash3d);
     if (type & GPU_FEATURE_TYPE_FLASH_STAGE3D)
       matches.push_back(kGpuFeatureNameFlashStage3d);
+    if (type & GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE)
+      matches.push_back(kGpuFeatureNameFlashStage3dBaseline);
     if (type & GPU_FEATURE_TYPE_TEXTURE_SHARING)
       matches.push_back(kGpuFeatureNameTextureSharing);
     if (type & GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE)
       matches.push_back(kGpuFeatureNameAcceleratedVideoDecode);
     if (type & GPU_FEATURE_TYPE_3D_CSS)
       matches.push_back(kGpuFeatureName3dCss);
     if (type & GPU_FEATURE_TYPE_ACCELERATED_VIDEO)
       matches.push_back(kGpuFeatureNameAcceleratedVideo);
     if (type & GPU_FEATURE_TYPE_PANEL_FITTING)
       matches.push_back(kGpuFeatureNamePanelFitting);
@@ skipping 108 matching lines @@
         kGpuBlacklistFeatureHistogramNamesWin[i],
         1, kNumWinSubVersions * kGpuFeatureNumStatus,
         kNumWinSubVersions * kGpuFeatureNumStatus + 1,
         base::HistogramBase::kUmaTargetedHistogramFlag);
     histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value));
 #endif
   }
 }
 
 }  // namespace content