diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 20:25:56 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 20:25:56 +0000 |
| commit | 7af65ca359d53a0bc629bdf37b1be4eb53c2de8c (patch) | |
| tree | ee3e5314db8c4e94f40202edde71c819a98040b6 /content/browser/gpu/compositor_util.cc | |
| parent | addac55b65f9b65b9f1ba6417796c608380716e8 (diff) | |
| download | chromium_src-7af65ca359d53a0bc629bdf37b1be4eb53c2de8c.zip chromium_src-7af65ca359d53a0bc629bdf37b1be4eb53c2de8c.tar.gz chromium_src-7af65ca359d53a0bc629bdf37b1be4eb53c2de8c.tar.bz2 | |
Remove --disable-accelerated-compositing
After r264075, this is not used by the renderer. Also, nothing sets it
but tests (and for the wrong reasons). Also, it's not like it works any
more after r264103. Replace it in tests by --disable-gpu, and remove
from the code.
BUG=362164
R=danakj@chromium.org, kbr@chromium.org, shess@chromium.org
Review URL: https://codereview.chromium.org/238933009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/compositor_util.cc')
| -rw-r--r-- | content/browser/gpu/compositor_util.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/content/browser/gpu/compositor_util.cc b/content/browser/gpu/compositor_util.cc index c98297b..0d82711 100644 --- a/content/browser/gpu/compositor_util.cc +++ b/content/browser/gpu/compositor_util.cc @@ -44,7 +44,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) { "compositing", manager->IsFeatureBlacklisted( gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING), - command_line.HasSwitch(switches::kDisableAcceleratedCompositing), + false, "Accelerated compositing has been disabled, either via about:flags or" " command line. This adversely affects performance of all hardware" " accelerated features.", @@ -65,7 +65,6 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) { gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING) || manager->IsFeatureBlacklisted(gpu::GPU_FEATURE_TYPE_3D_CSS), command_line.HasSwitch(cc::switches::kDisableThreadedAnimation) || - command_line.HasSwitch(switches::kDisableAcceleratedCompositing) || command_line.HasSwitch(switches::kDisableAcceleratedLayers), "Accelerated CSS animation has been disabled at the command line.", true @@ -127,8 +126,7 @@ const GpuFeatureInfo GetGpuFeatureInfo(size_t index, bool* eof) { "video", manager->IsFeatureBlacklisted( gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO), - command_line.HasSwitch(switches::kDisableAcceleratedVideo) || - command_line.HasSwitch(switches::kDisableAcceleratedCompositing), + command_line.HasSwitch(switches::kDisableAcceleratedVideo), "Accelerated video presentation has been disabled, either via" " about:flags or command line.", true @@ -179,10 +177,6 @@ bool CanDoAcceleratedCompositing() { if (manager->ShouldUseSwiftShader()) return false; - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); - if (command_line.HasSwitch(switches::kDisableAcceleratedCompositing)) - return false; - return true; } @@ -294,7 +288,6 @@ bool IsForceGpuRasterizationEnabled() { } base::Value* GetFeatureStatus() { - const CommandLine& command_line = *CommandLine::ForCurrentProcess(); GpuDataManagerImpl* manager = GpuDataManagerImpl::GetInstance(); std::string gpu_access_blocked_reason; bool gpu_access_blocked = @@ -337,9 +330,8 @@ base::Value* GetFeatureStatus() { } else { status = "enabled"; if (gpu_feature_info.name == "webgl" && - (command_line.HasSwitch(switches::kDisableAcceleratedCompositing) || - manager->IsFeatureBlacklisted( - gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING))) + (manager->IsFeatureBlacklisted( + gpu::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING))) status += "_readback"; bool has_thread = IsThreadedCompositingEnabled(); if (gpu_feature_info.name == "compositing") { |