Merge 186345

content/browser/gpu/gpu_data_manager_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/gpu/gpu_data_manager_impl.h"
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif  // OS_MACOSX
 
@@ skipping 417 matching lines @@
         break;
     }
   } else {
     command_line->AppendSwitchASCII(switches::kSupportsDualGpus, "false");
   }
 
   if (!swiftshader_path.empty())
     command_line->AppendSwitchPath(switches::kSwiftShaderPath,
                                    swiftshader_path);
 
+#if defined(OS_WIN)
+  // DisplayLink 7.1 and earlier can cause the GPU process to crash on startup.
+  // http://crbug.com/177611
+  if (gpu_info_.display_link_version.IsValid()
+      && gpu_info_.display_link_version.IsOlderThan("7.2")) {
+    command_line->AppendSwitch(switches::kReduceGpuSandbox);
+  }
+#endif
+
   {
     base::AutoLock auto_lock(gpu_info_lock_);
     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);
     }
@@ skipping 328 matching lines @@
                             BLOCK_STATUS_MAX);
 
   return DOMAIN_BLOCK_STATUS_NOT_BLOCKED;
 }
 
 int64 GpuDataManagerImpl::GetBlockAllDomainsDurationInMs() const {
   return kBlockAllDomainsMs;
 }
 
 }  // namespace content