| Index: content/browser/gpu/gpu_data_manager_impl.h
|
| diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
|
| index 83697dfd7c0d428bb681494256b28717d0a54d6d..39bec6cd5fe9e3a15c53d791b2f901dfb78be070 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl.h
|
| +++ b/content/browser/gpu/gpu_data_manager_impl.h
|
| @@ -21,6 +21,7 @@
|
| #include "base/values.h"
|
| #include "content/public/browser/gpu_data_manager.h"
|
| #include "content/public/common/three_d_api_types.h"
|
| +#include "gpu/config/gpu_control_list.h"
|
| #include "gpu/config/gpu_feature_info.h"
|
| #include "gpu/config/gpu_info.h"
|
|
|
| @@ -65,8 +66,7 @@ class CONTENT_EXPORT GpuDataManagerImpl
|
| static GpuDataManagerImpl* GetInstance();
|
|
|
| // GpuDataManager implementation.
|
| - void InitializeForTesting(const std::string& gpu_blacklist_json,
|
| - const gpu::GPUInfo& gpu_info) override;
|
| + void BlacklistWebGLForTesting() override;
|
| bool IsFeatureBlacklisted(int feature) const override;
|
| bool IsFeatureEnabled(int feature) const override;
|
| bool IsWebGLEnabled() const override;
|
| @@ -104,6 +104,9 @@ class CONTENT_EXPORT GpuDataManagerImpl
|
| // startup time in UI thread before the IO restriction is turned on.
|
| void Initialize();
|
|
|
| + void InitializeForTesting(const gpu::GpuControlListData& gpu_blacklist_data,
|
| + const gpu::GPUInfo& gpu_info);
|
| +
|
| // Only update if the current GPUInfo is not finalized. If blacklist is
|
| // loaded, run through blacklist and update blacklisted features.
|
| void UpdateGpuInfo(const gpu::GPUInfo& gpu_info);
|
|
|