diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gpu_process_host.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/gpu_blacklist.json | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/chrome/browser/gpu_process_host.cc b/chrome/browser/gpu_process_host.cc index d74c1fa..e7172b4 100644 --- a/chrome/browser/gpu_process_host.cc +++ b/chrome/browser/gpu_process_host.cc @@ -5,6 +5,7 @@ #include "chrome/browser/gpu_process_host.h" #include "app/app_switches.h" +#include "app/gfx/gl/gl_implementation.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" @@ -403,6 +404,8 @@ bool GpuProcessHost::LoadGpuBlacklist() { GpuBlacklist* blacklist = new GpuBlacklist(); const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) || + browser_command_line.GetSwitchValueASCII( + switches::kUseGL) == gfx::kGLImplementationOSMesaName || blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) { gpu_blacklist_.reset(blacklist); return true; diff --git a/chrome/browser/resources/gpu_blacklist.json b/chrome/browser/resources/gpu_blacklist.json index 8c976c7..203d181 100644 --- a/chrome/browser/resources/gpu_blacklist.json +++ b/chrome/browser/resources/gpu_blacklist.json @@ -38,7 +38,7 @@ { "name": "gpu blacklist", // Please update the version number whenever you change this file. - "version": "0.8", + "version": "0.9", "entries": [ { // ATI Radeon X1900 on Mac, BUGWEBKIT=47028 "id": "1", @@ -138,6 +138,20 @@ "webgl", "accelerated_compositing" ] + }, + { // Windows XP, BUG=72975 + "id": "9", + "os": { + "type": "win", + "version": { + "op": "=", + "number": "5" + } + }, + "blacklist": [ + "webgl", + "accelerated_compositing" + ] } ] } |