diff options
| author | skaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 00:26:40 +0000 |
|---|---|---|
| committer | skaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 00:26:40 +0000 |
| commit | 8f3f654a21983e22b0354f7351c5710bf62d02eb (patch) | |
| tree | 490ff6c7a01a9218176f348980949e8a1315055c /content/browser/gpu/gpu_data_manager_impl.h | |
| parent | 0dc56ad8a60b5323f71870c1d56cb02c5a85c980 (diff) | |
| download | chromium_src-8f3f654a21983e22b0354f7351c5710bf62d02eb.zip chromium_src-8f3f654a21983e22b0354f7351c5710bf62d02eb.tar.gz chromium_src-8f3f654a21983e22b0354f7351c5710bf62d02eb.tar.bz2 | |
Clean up software compositing switches.
After this patch just --disable-gpu should be enough to put Chrome in software compositing mode for Aura builds.
Relanding https://codereview.chromium.org/13985036 which got a speculative revert.
TBR=piman@chromium.org,jamesr@chromium.org,jochen@chromium.org
NOTRY=true
BUG=229712,230120
Review URL: https://chromiumcodereview.appspot.com/14598004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager_impl.h')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index 34462ff..a184180 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -86,6 +86,7 @@ class CONTENT_EXPORT GpuDataManagerImpl std::string* gl_renderer, std::string* gl_version) OVERRIDE; virtual void DisableHardwareAcceleration() OVERRIDE; + virtual void EnableSoftwareCompositing() OVERRIDE; // This collects preliminary GPU info, load GpuBlacklist, and compute the // preliminary blacklisted features; it should only be called at browser @@ -270,8 +271,11 @@ class CONTENT_EXPORT GpuDataManagerImpl ListValue log_messages_; mutable base::Lock log_messages_lock_; - bool use_swiftshader_; + // TODO(skaslev) Remove this after all legacy s/w rendering paths are removed. + // Then use_software_compositor_ will be implicitly always true. + bool use_software_compositor_; + bool use_swiftshader_; base::FilePath swiftshader_path_; // Current card force-blacklisted due to GPU crashes, or disabled through |