Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: content/browser/gpu/gpu_data_manager_impl.cc

Issue 12830005: Windows: Disable GPU process sandbox if Thinkpad USB Port Replicator is installed. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/gpu/gpu_data_manager_impl.h" 5 #include "content/browser/gpu/gpu_data_manager_impl.h"
6 6
7 #if defined(OS_MACOSX) 7 #if defined(OS_MACOSX)
8 #include <ApplicationServices/ApplicationServices.h> 8 #include <ApplicationServices/ApplicationServices.h>
9 #endif // OS_MACOSX 9 #endif // OS_MACOSX
10 10
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 command_line->AppendSwitchASCII(switches::kSupportsDualGpus, "false"); 416 command_line->AppendSwitchASCII(switches::kSupportsDualGpus, "false");
417 } 417 }
418 418
419 if (!swiftshader_path.empty()) 419 if (!swiftshader_path.empty())
420 command_line->AppendSwitchPath(switches::kSwiftShaderPath, 420 command_line->AppendSwitchPath(switches::kSwiftShaderPath,
421 swiftshader_path); 421 swiftshader_path);
422 422
423 #if defined(OS_WIN) 423 #if defined(OS_WIN)
424 // DisplayLink 7.1 and earlier can cause the GPU process to crash on startup. 424 // DisplayLink 7.1 and earlier can cause the GPU process to crash on startup.
425 // http://crbug.com/177611 425 // http://crbug.com/177611
426 if (gpu_info_.display_link_version.IsValid() 426 // Thinkpad USB Port Replicator driver causes GPU process to crash when the
427 && gpu_info_.display_link_version.IsOlderThan("7.2")) { 427 // sandbox is enabled. http://crbug.com/181665.
428 if ((gpu_info_.display_link_version.IsValid()
429 && gpu_info_.display_link_version.IsOlderThan("7.2")) ||
430 gpu_info_.lenovo_dcute) {
428 command_line->AppendSwitch(switches::kReduceGpuSandbox); 431 command_line->AppendSwitch(switches::kReduceGpuSandbox);
429 } 432 }
430 #endif 433 #endif
431 434
432 { 435 {
433 base::AutoLock auto_lock(gpu_info_lock_); 436 base::AutoLock auto_lock(gpu_info_lock_);
434 if (gpu_info_.optimus) 437 if (gpu_info_.optimus)
435 command_line->AppendSwitch(switches::kReduceGpuSandbox); 438 command_line->AppendSwitch(switches::kReduceGpuSandbox);
436 if (gpu_info_.amd_switchable) { 439 if (gpu_info_.amd_switchable) {
437 // The image transport surface currently doesn't work with AMD Dynamic 440 // The image transport surface currently doesn't work with AMD Dynamic
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 806
804 void GpuDataManagerImpl::Notify3DAPIBlocked(const GURL& url, 807 void GpuDataManagerImpl::Notify3DAPIBlocked(const GURL& url,
805 int render_process_id, 808 int render_process_id,
806 int render_view_id, 809 int render_view_id,
807 ThreeDAPIType requester) { 810 ThreeDAPIType requester) {
808 observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs, 811 observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs,
809 url, render_process_id, render_view_id, requester); 812 url, render_process_id, render_view_id, requester);
810 } 813 }
811 814
812 } // namespace content 815 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698