summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_data_manager_impl.h
diff options
context:
space:
mode:
authorskaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 22:04:09 +0000
committerskaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 22:04:09 +0000
commit37dc90f4f95b4a00881ca6263faa1d6b6e0d8bbe (patch)
tree86e05cf11ea050dab2562b56aacd3e61a5b02fe6 /content/browser/gpu/gpu_data_manager_impl.h
parentb794505a14a83d2c162bf2979a36b39ce748229c (diff)
downloadchromium_src-37dc90f4f95b4a00881ca6263faa1d6b6e0d8bbe.zip
chromium_src-37dc90f4f95b4a00881ca6263faa1d6b6e0d8bbe.tar.gz
chromium_src-37dc90f4f95b4a00881ca6263faa1d6b6e0d8bbe.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. NOTRY=true BUG=229712, 230120 Review URL: https://chromiumcodereview.appspot.com/13985036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197493 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.h6
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 0bca69b..9683e89 100644
--- a/content/browser/gpu/gpu_data_manager_impl.h
+++ b/content/browser/gpu/gpu_data_manager_impl.h
@@ -89,6 +89,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
@@ -273,8 +274,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