| 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
|
|
|