diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 18:40:30 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 18:40:30 +0000 |
| commit | e67de7a7761dc403b9af9a4371cc5824cc19cde2 (patch) | |
| tree | 503575818b6cddbef99f79e672dcb4a78cbd1578 /content | |
| parent | c6f1f4b523ee7b73afcb6c8275e823ca1df87747 (diff) | |
| download | chromium_src-e67de7a7761dc403b9af9a4371cc5824cc19cde2.zip chromium_src-e67de7a7761dc403b9af9a4371cc5824cc19cde2.tar.gz chromium_src-e67de7a7761dc403b9af9a4371cc5824cc19cde2.tar.bz2 | |
Remove ForceCompositingMode from the GPU blacklist.
This mode is always on for everything we ship, so we never need to
blacklist it.
R=jbauman@chromium.org
BUG=363772
Review URL: https://codereview.chromium.org/239253005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/gpu/compositor_util.cc | 13 | ||||
| -rw-r--r-- | content/browser/gpu/gpu_data_manager_impl_private.cc | 3 |
2 files changed, 3 insertions, 13 deletions
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index 5b2e591..c98297b 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc @@ -145,12 +145,8 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) { #endif { "force_compositing_mode", - manager->IsFeatureBlacklisted( - gpu::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE) && + false, !IsForceCompositingModeEnabled(), - !IsForceCompositingModeEnabled() && - !manager->IsFeatureBlacklisted( - gpu::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE), "Force compositing mode is off, either disabled at the command" " line or not supported by the current system.", false @@ -190,11 +186,6 @@ bool CanDoAcceleratedCompositing() { return true; } -bool IsForceCompositingModeBlacklisted() { - return GpuDataManagerImpl::GetInstance()->IsFeatureBlacklisted( - gpu::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE); -} - } // namespace bool IsThreadedCompositingEnabled() { @@ -226,7 +217,7 @@ bool IsForceCompositingModeEnabled() { if (command_line.HasSwitch(switches::kForceCompositingMode)) return true; - if (!CanDoAcceleratedCompositing() || IsForceCompositingModeBlacklisted()) + if (!CanDoAcceleratedCompositing()) return false; #if defined(OS_MACOSX) || defined(OS_WIN) diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index 5b4a92a..eb21bfb 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc @@ -900,8 +900,7 @@ bool GpuDataManagerImplPrivate::UpdateActiveGpu( bool GpuDataManagerImplPrivate::CanUseGpuBrowserCompositor() const { return !ShouldUseSwiftShader() && - !IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) && - !IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE); + !IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING); } void GpuDataManagerImplPrivate::BlockDomainFrom3DAPIs( |