diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 22:09:00 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 22:09:00 +0000 |
| commit | ee9ac1de36f5e1a29e8c07d690122205a232e13e (patch) | |
| tree | 931d146b2d0b67224b6ffff173e25e2e77673949 /content/browser/gpu | |
| parent | 83c3cb14a4a8629df75b509e926e3c06438391d1 (diff) | |
| download | chromium_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')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.cc | 10 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl.h | 3 |
2 files changed, 6 insertions, 7 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_); diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h index 1e15313..a1ea201 100644 --- a/content/browser/gpu/gpu_data_manager_impl.h +++ b/content/browser/gpu/gpu_data_manager_impl.h @@ -80,6 +80,7 @@ class CONTENT_EXPORT GpuDataManagerImpl std::string* gl_renderer, std::string* gl_version) OVERRIDE; virtual void DisableHardwareAcceleration() OVERRIDE; + virtual bool CanUseGpuBrowserCompositor() const OVERRIDE; // This collects preliminary GPU info, load GpuBlacklist, and compute the // preliminary blacklisted features; it should only be called at browser @@ -141,8 +142,6 @@ class CONTENT_EXPORT GpuDataManagerImpl bool IsUsingAcceleratedSurface() const; #endif - bool CanUseGpuBrowserCompositor() const; - // Maintenance of domains requiring explicit user permission before // using client-facing 3D APIs (WebGL, Pepper 3D), either because // the domain has caused the GPU to reset, or because too many GPU |