summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_data_manager_impl.cc
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 22:09:00 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-23 22:09:00 +0000
commitee9ac1de36f5e1a29e8c07d690122205a232e13e (patch)
tree931d146b2d0b67224b6ffff173e25e2e77673949 /content/browser/gpu/gpu_data_manager_impl.cc
parent83c3cb14a4a8629df75b509e926e3c06438391d1 (diff)
downloadchromium_src-ee9ac1de36f5e1a29e8c07d690122205a232e13e.zip
chromium_src-ee9ac1de36f5e1a29e8c07d690122205a232e13e.tar.gz
chromium_src-ee9ac1de36f5e1a29e8c07d690122205a232e13e.tar.bz2
Disable WebViewTest.Shim(resize-related) tests in software compositing mode.
BUG=295801 R=fsamuel@chromium.org, jbauman@chromium.org, joi@chromium.org, zmo@chromium.org Review URL: https://codereview.chromium.org/23726050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager_impl.cc')
-rw-r--r--content/browser/gpu/gpu_data_manager_impl.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index dbdcbe21..3109657 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -117,6 +117,11 @@ void GpuDataManagerImpl::DisableHardwareAcceleration() {
private_->DisableHardwareAcceleration();
}
+bool GpuDataManagerImpl::CanUseGpuBrowserCompositor() const {
+ base::AutoLock auto_lock(lock_);
+ return private_->CanUseGpuBrowserCompositor();
+}
+
void GpuDataManagerImpl::Initialize() {
base::AutoLock auto_lock(lock_);
private_->Initialize();
@@ -213,11 +218,6 @@ bool GpuDataManagerImpl::IsUsingAcceleratedSurface() const {
}
#endif
-bool GpuDataManagerImpl::CanUseGpuBrowserCompositor() const {
- base::AutoLock auto_lock(lock_);
- return private_->CanUseGpuBrowserCompositor();
-}
-
void GpuDataManagerImpl::BlockDomainFrom3DAPIs(
const GURL& url, DomainGuilt guilt) {
base::AutoLock auto_lock(lock_);