Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1178)

Unified Diff: content/browser/gpu/gpu_data_manager_impl.h

Issue 10911315: Move gpu blacklist data file to content side. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/gpu_blacklist_unittest.cc ('k') | content/browser/gpu/gpu_data_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_data_manager_impl.h
===================================================================
--- content/browser/gpu/gpu_data_manager_impl.h (revision 156701)
+++ content/browser/gpu/gpu_data_manager_impl.h (working copy)
@@ -30,11 +30,7 @@
static GpuDataManagerImpl* GetInstance();
// GpuDataManager implementation.
- virtual void Initialize(
- const std::string& browser_version_string,
- const std::string& gpu_blacklist_json) OVERRIDE;
- virtual void Initialize(
- const std::string& browser_version_string,
+ virtual void InitializeForTesting(
const std::string& gpu_blacklist_json,
const content::GPUInfo& gpu_info) OVERRIDE;
virtual content::GpuFeatureType GetBlacklistedFeatures() const OVERRIDE;
@@ -55,6 +51,11 @@
virtual void RemoveObserver(
content::GpuDataManagerObserver* observer) OVERRIDE;
+ // This collects preliminary GPU info, load GpuBlacklist, and compute the
+ // preliminary blacklisted features; it should only be called at browser
+ // startup time in UI thread before the IO restriction is turned on.
+ void Initialize();
+
// Only update if the current GPUInfo is not finalized. If blacklist is
// loaded, run through blacklist and update blacklisted features.
void UpdateGpuInfo(const content::GPUInfo& gpu_info);
@@ -101,6 +102,9 @@
GpuDataManagerImpl();
virtual ~GpuDataManagerImpl();
+ void InitializeImpl(const std::string& gpu_blacklist_json,
+ const content::GPUInfo& gpu_info);
+
void UpdateBlacklistedFeatures(content::GpuFeatureType features);
// This should only be called once at initialization time, when preliminary
« no previous file with comments | « content/browser/gpu/gpu_blacklist_unittest.cc ('k') | content/browser/gpu/gpu_data_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698