| Index: content/browser/gpu/gpu_data_manager_impl.h
|
| ===================================================================
|
| --- content/browser/gpu/gpu_data_manager_impl.h (revision 186737)
|
| +++ content/browser/gpu/gpu_data_manager_impl.h (working copy)
|
| @@ -79,6 +79,7 @@
|
| virtual void GetGLStrings(std::string* gl_vendor,
|
| std::string* gl_renderer,
|
| std::string* gl_version) OVERRIDE;
|
| + virtual void DisableHardwareAcceleration() OVERRIDE;
|
|
|
| // This collects preliminary GPU info, load GpuBlacklist, and compute the
|
| // preliminary blacklisted features; it should only be called at browser
|
| @@ -106,10 +107,6 @@
|
|
|
| GpuSwitchingOption GetGpuSwitchingOption() const;
|
|
|
| - // Force the current card to be blacklisted (usually due to GPU process
|
| - // crashes).
|
| - void BlacklistCard();
|
| -
|
| std::string GetBlacklistVersion() const;
|
|
|
| // Returns the reasons for the latest run of blacklisting decisions.
|
| @@ -170,7 +167,8 @@
|
|
|
| FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest, GpuSideBlacklisting);
|
| FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest, GpuSideExceptions);
|
| - FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest, BlacklistCard);
|
| + FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest,
|
| + DisableHardwareAcceleration);
|
| FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest, SoftwareRendering);
|
| FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest, SoftwareRendering2);
|
| FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest, GpuInfoUpdate);
|
|
|