Add force_compositing_mode support in gpu blacklist.

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"
@@ skipping 11 matching lines @@
 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 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 {
     kGpuFeatureEnabled = 0,
     kGpuFeatureBlacklisted = 1,
     kGpuFeatureDisabled = 2,  // disabled by user but not blacklisted
     kGpuFeatureNumStatus
 };
 
@@ skipping 59 matching lines @@
   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;
+  if (feature_string == kGpuFeatureNameForceCompositingMode)
+    return GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE;
   if (feature_string == kGpuFeatureNameAll)
     return GPU_FEATURE_TYPE_ALL;
   return GPU_FEATURE_TYPE_UNKNOWN;
 }
 
 std::string GpuFeatureTypeToString(GpuFeatureType type) {
   std::vector<std::string> matches;
   if (type == GPU_FEATURE_TYPE_ALL) {
     matches.push_back(kGpuFeatureNameAll);
   } else {
@@ skipping 12 matching lines @@
     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);
+    if (type & GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE)
+      matches.push_back(kGpuFeatureNameForceCompositingMode);
     if (!matches.size())
       matches.push_back(kGpuFeatureNameUnknown);
   }
   return JoinString(matches, ',');
 }
 
 GpuSwitchingOption StringToGpuSwitchingOption(
     const std::string& switching_string) {
   if (switching_string == switches::kGpuSwitchingOptionNameAutomatic)
     return GPU_SWITCHING_OPTION_AUTOMATIC;
@@ skipping 96 matching lines @@
         kGpuBlacklistFeatureHistogramNamesWin[i],
         1, kNumWinSubVersions * kGpuFeatureNumStatus,
         kNumWinSubVersions * kGpuFeatureNumStatus + 1,
         base::Histogram::kUmaTargetedHistogramFlag);
     histogram_pointer->Add(GetGpuBlacklistHistogramValueWin(value));
 #endif
   }
 }
 
 }  // namespace content