Revert 131376 - Revert 130496 - Disable image transport surface on AMD GPUs

content/browser/gpu/gpu_data_manager.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_data_manager.h"
 
 #if defined(OS_MACOSX)
 #include <CoreGraphics/CGDisplayConfiguration.h>
 #endif
 
@@ skipping 489 matching lines @@
                 GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)) &&
       (user_flags_.use_gl() == "any")) {
     command_line->AppendSwitchASCII(
         switches::kUseGL, gfx::kGLImplementationOSMesaName);
   } else if (!user_flags_.use_gl().empty()) {
     command_line->AppendSwitchASCII(switches::kUseGL, user_flags_.use_gl());
   }
 
   if (gpu_info().optimus)
     command_line->AppendSwitch(switches::kReduceGpuSandbox);
+  if (gpu_info().amd_switchable) {
+    // The image transport surface currently doesn't work with AMD Dynamic
+    // Switchable graphics.
+    command_line->AppendSwitch(switches::kReduceGpuSandbox);
+    command_line->AppendSwitch(switches::kDisableImageTransportSurface);
+  }
 }
 
 void GpuDataManager::SetGpuBlacklist(GpuBlacklist* gpu_blacklist) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(gpu_blacklist);
   gpu_blacklist_.reset(gpu_blacklist);
   UpdateGpuFeatureFlags();
   preliminary_gpu_feature_flags_ = gpu_feature_flags_;
 }
 
@@ skipping 201 matching lines @@
       object->vendor_id != other.vendor_id) {
     *object = other;
     return true;
   }
 
   bool changed = false;
   if (!object->finalized) {
     object->finalized = other.finalized;
     object->initialization_time = other.initialization_time;
     object->optimus |= other.optimus;
+    object->amd_switchable |= other.amd_switchable;
 
     if (object->driver_vendor.empty()) {
       changed |= object->driver_vendor != other.driver_vendor;
       object->driver_vendor = other.driver_vendor;
     }
     if (object->driver_version.empty()) {
       changed |= object->driver_version != other.driver_version;
       object->driver_version = other.driver_version;
     }
     if (object->driver_date.empty()) {
@@ skipping 43 matching lines @@
 bool GpuDataManager::supportsAccelerated2dCanvas() const {
   if (gpu_info_.can_lose_context)
     return false;
 #if defined(USE_SKIA)
   return true;
 #else
   return false;
 #endif
 }