summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoramarinichev@chromium.org <amarinichev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-22 21:42:42 +0000
committeramarinichev@chromium.org <amarinichev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-22 21:42:42 +0000
commitf0db0ee76350fe3f157778c4bea604cff5fa123e (patch)
tree0a95566f594530068d43589de845a2c9e13b5da1 /chrome/browser
parent3225aeb02d64058e7d30ffcfda69a68002e2af53 (diff)
downloadchromium_src-f0db0ee76350fe3f157778c4bea604cff5fa123e.zip
chromium_src-f0db0ee76350fe3f157778c4bea604cff5fa123e.tar.gz
chromium_src-f0db0ee76350fe3f157778c4bea604cff5fa123e.tar.bz2
Prevent blacklisting of Intel GPUs on ChromeOS
In software rendering list logic, ChromeOS is identified as Linux. Therefore, all the GPU drivers that are blacklisted in Linux are blacklisted in ChromeOS. This change identifies ChromeOS specifically and bypasses the software rendering list logic. BUG=chromium-os:13342 TEST=GPU acceleration restored in Chromium OS with Intel GPU. Review URL: http://codereview.chromium.org/6715030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/software_rendering_list.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/resources/software_rendering_list.json b/chrome/browser/resources/software_rendering_list.json
index c12297f..a768a1c 100644
--- a/chrome/browser/resources/software_rendering_list.json
+++ b/chrome/browser/resources/software_rendering_list.json
@@ -14,7 +14,8 @@
// Each entry contains the following fields:
// 1. "id" is an integer. 0 is reserved. This field is mandatory.
// 2. "os" contains "type" and an optional "version". "type" could be "macosx",
-// "linux", "win", or "any". "any" is the same as not specifying "os".
+// "linux", "win", "chromeos", or "any". "any" is the same as not specifying
+// "os".
// "version" is a VERSION structure (defined below).
// 3. "vendor_id" is a string. 0 is reserved.
// 4. "device_id" is an array of strings. 0 is reserved.