Manage gpu feature capabilities through blacklist indepedently.

content/browser/gpu/gpu_data_manager.cc

 // Copyright (c) 2011 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_data_manager.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/browser_thread.h"
@@ skipping 94 matching lines @@
 }
 
 GpuFeatureFlags GpuDataManager::GetGpuFeatureFlags() {
   return gpu_feature_flags_;
 }
 
 bool GpuDataManager::GpuAccessAllowed() {
   // We only need to block GPU process if more features are disallowed other
   // than those in the preliminary gpu feature flags because the latter work
   // through renderer commandline switches.
-  // However, if accelerated_compositing is not allowed, then we should always
-  // deny gpu access.
-  uint32 mask = (~(preliminary_gpu_feature_flags_.flags())) |
-                GpuFeatureFlags::kGpuFeatureAcceleratedCompositing;
+  uint32 mask = (~(preliminary_gpu_feature_flags_.flags()));
   return (gpu_feature_flags_.flags() & mask) == 0;
 }
 
 void GpuDataManager::AddGpuInfoUpdateCallback(Callback0::Type* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   gpu_info_update_callbacks_.insert(callback);
 }
 
 bool GpuDataManager::RemoveGpuInfoUpdateCallback(Callback0::Type* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 11 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(command_line);
 
   uint32 flags = gpu_feature_flags_.flags();
   if ((flags & GpuFeatureFlags::kGpuFeatureWebgl) &&
       !command_line->HasSwitch(switches::kDisableExperimentalWebGL))
     command_line->AppendSwitch(switches::kDisableExperimentalWebGL);
   if ((flags & GpuFeatureFlags::kGpuFeatureMultisampling) &&
       !command_line->HasSwitch(switches::kDisableGLMultisampling))
     command_line->AppendSwitch(switches::kDisableGLMultisampling);
-  // If we have kGpuFeatureAcceleratedCompositing, we disable all GPU features.
-  if (flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) {
-    const char* switches[] = {
-        switches::kDisableAcceleratedCompositing,
-        switches::kDisableExperimentalWebGL,
-        switches::kDisableAccelerated2dCanvas
-    };
-    const int switch_count = sizeof(switches) / sizeof(char*);
-    for (int i = 0; i < switch_count; ++i) {
-      if (!command_line->HasSwitch(switches[i]))
-        command_line->AppendSwitch(switches[i]);
-    }
-  }
+  if ((flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) &&
+      !command_line->HasSwitch(switches::kDisableAcceleratedCompositing))
+    command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
 }
 
 void GpuDataManager::SetBuiltInGpuBlacklist(GpuBlacklist* built_in_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(built_in_list);
   uint16 version_major, version_minor;
   bool succeed = built_in_list->GetVersion(
       &version_major, &version_minor);
   DCHECK(succeed);
   gpu_blacklist_.reset(built_in_list);
@@ skipping 92 matching lines @@
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
       browser_command_line.GetSwitchValueASCII(
           switches::kUseGL) == gfx::kGLImplementationOSMesaName)
     return NULL;
   // No need to return an empty blacklist.
   if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0)
     return NULL;
   return gpu_blacklist_.get();
 }