diff options
| author | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 17:06:52 +0000 |
|---|---|---|
| committer | zmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 17:06:52 +0000 |
| commit | fea14e27b972f601e5e5fbbd0d597ca5f07070ca (patch) | |
| tree | 1ab5634f9ec5ecfca9c2f4c69bf908cb4e5033b8 /chrome/browser/gpu_process_host_ui_shim.cc | |
| parent | 49403db61ab8dd8992e89691e5159f19aa34a446 (diff) | |
| download | chromium_src-fea14e27b972f601e5e5fbbd0d597ca5f07070ca.zip chromium_src-fea14e27b972f601e5e5fbbd0d597ca5f07070ca.tar.gz chromium_src-fea14e27b972f601e5e5fbbd0d597ca5f07070ca.tar.bz2 | |
Blacklist GPU features on Windows XP.
Also, gpu blacklist is ignored if use-gl=osmesa; this is for chromium bots.
BUG=72975
TEST=on XP WebGL is disabled
Review URL: http://codereview.chromium.org/6526020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_process_host_ui_shim.cc')
| -rw-r--r-- | chrome/browser/gpu_process_host_ui_shim.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/gpu_process_host_ui_shim.cc b/chrome/browser/gpu_process_host_ui_shim.cc index 93d455a..ef3f999 100644 --- a/chrome/browser/gpu_process_host_ui_shim.cc +++ b/chrome/browser/gpu_process_host_ui_shim.cc @@ -4,6 +4,8 @@ #include "chrome/browser/gpu_process_host_ui_shim.h" +#include "app/app_switches.h" +#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "chrome/browser/browser_thread.h" @@ -326,7 +328,9 @@ void GpuProcessHostUIShim::OnChannelEstablished( gpu_feature_flags_set_ = true; const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); - if (!browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) { + if (!browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && + browser_command_line.GetSwitchValueASCII( + switches::kUseGL) != gfx::kGLImplementationOSMesaName) { gpu_feature_flags_ = gpu_blacklist_->DetermineGpuFeatureFlags( GpuBlacklist::kOsAny, NULL, gpu_info); |