summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 23:42:20 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 23:42:20 +0000
commit03482f409ad1e58d67df4293f4cf88bdaf8067b5 (patch)
tree82e97420e48d5a92d23e5e330bd65f10f89b4f8c /chrome/browser
parent7904d87a83cf58c83801e4d22b50ec0dbf1e0aea (diff)
downloadchromium_src-03482f409ad1e58d67df4293f4cf88bdaf8067b5.zip
chromium_src-03482f409ad1e58d67df4293f4cf88bdaf8067b5.tar.gz
chromium_src-03482f409ad1e58d67df4293f4cf88bdaf8067b5.tar.bz2
Change gpu_blacklist.json filename to software_rendering_list.json.
BUG=73796 TEST=compile and start chrome and view about:gpu page fine TBR=vangelis@chromium.org Review URL: http://codereview.chromium.org/6581011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_resources.grd2
-rw-r--r--chrome/browser/resources/software_rendering_list.json (renamed from chrome/browser/resources/gpu_blacklist.json)6
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 6fd7f71..d526a2f 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -44,7 +44,7 @@ without changes to the corresponding grd file. etaa -->
<include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.json" type="BINDATA" />
<include name="IDR_LOGIN_HTML" file="resources\login.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_GPU_BLACKLIST" file="resources\gpu_blacklist.json" type="BINDATA" />
+ <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list.json" type="BINDATA" />
<include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incognito_tab_theme.css" flattenhtml="true" type="BINDATA" />
<include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/resources/gpu_blacklist.json b/chrome/browser/resources/software_rendering_list.json
index 203d181..6969c7db 100644
--- a/chrome/browser/resources/gpu_blacklist.json
+++ b/chrome/browser/resources/software_rendering_list.json
@@ -1,5 +1,5 @@
// Determines whether certain gpu-related features are blacklisted or not.
-// A valid gpu_blacklist.json file are in the format of
+// A valid software_rendering_list.json file are in the format of
// {
// "version": "x.y",
// "entries": [
@@ -36,9 +36,9 @@
// "contains", "beginwith", "endwith", "=". "value" is a string.
{
- "name": "gpu blacklist",
+ "name": "software rendering list",
// Please update the version number whenever you change this file.
- "version": "0.9",
+ "version": "1.0",
"entries": [
{ // ATI Radeon X1900 on Mac, BUGWEBKIT=47028
"id": "1",