summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu_blacklist.h
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 18:58:11 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 18:58:11 +0000
commit07c0b6d39b5b44ddcaec214248638b1aa9bb8c16 (patch)
tree1b691ee23676b1f6f5bc442f0c32e0e497405846 /content/browser/gpu_blacklist.h
parent242c4bd36b82138f6ab7b2dea12b7d31830b0560 (diff)
downloadchromium_src-07c0b6d39b5b44ddcaec214248638b1aa9bb8c16.zip
chromium_src-07c0b6d39b5b44ddcaec214248638b1aa9bb8c16.tar.gz
chromium_src-07c0b6d39b5b44ddcaec214248638b1aa9bb8c16.tar.bz2
With this CL, GPU blacklist auto update from the web (before it ships together with chrome) is implemented. This allows us to blacklist bad GPU/drivers as soon as we discover them.
Note that this patch does not turn the auto update on. We will turn it on in a separate CL. BUG=68802 TEST=build bots all green Review URL: http://codereview.chromium.org/6469094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu_blacklist.h')
-rw-r--r--content/browser/gpu_blacklist.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/gpu_blacklist.h b/content/browser/gpu_blacklist.h
index f732af9..7758b65 100644
--- a/content/browser/gpu_blacklist.h
+++ b/content/browser/gpu_blacklist.h
@@ -37,6 +37,8 @@ class GpuBlacklist {
// If failed, the current GpuBlacklist is un-touched.
bool LoadGpuBlacklist(const std::string& json_context,
bool current_os_only);
+ bool LoadGpuBlacklist(const DictionaryValue& parsed_json,
+ bool current_os_only);
// Collects system information and combines them with gpu_info and blacklist
// information to determine gpu feature flags.
@@ -63,6 +65,11 @@ class GpuBlacklist {
// major and minor to 0 on failure.
bool GetVersion(uint16* major, uint16* monir) const;
+ // Collects the version of the current blacklist from a parsed json file.
+ // Returns false and sets major and minor to 0 on failure.
+ static bool GetVersion(
+ const DictionaryValue& parsed_json, uint16* major, uint16* minor);
+
private:
class VersionInfo {
public: