diff options
| author | junov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 14:59:25 +0000 |
|---|---|---|
| committer | junov@chromium.org <junov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 14:59:25 +0000 |
| commit | 206f3f04ea135c0f945754ed232b0f73c99726f3 (patch) | |
| tree | 70211cdd8b085e4e3edcaf6b1b02428de9a733be /content/browser/gpu/gpu_data_manager.cc | |
| parent | c8cbe57aa07a8f03111d2084284b774466ab1cf0 (diff) | |
| download | chromium_src-206f3f04ea135c0f945754ed232b0f73c99726f3.zip chromium_src-206f3f04ea135c0f945754ed232b0f73c99726f3.tar.gz chromium_src-206f3f04ea135c0f945754ed232b0f73c99726f3.tar.bz2 | |
Revert 88616 - Revert 86510 - Contributed by junov@chromium.org
re-enabling accelerated 2d canvas by default
Turns on the gpu accelerated canvas by default
BUG=82017
TEST=none
Review URL: http://codereview.chromium.org/7064032
TBR=junov@chromium.org
Review URL: http://codereview.chromium.org/6995124
TBR=vangelis@chromium.org
Review URL: http://codereview.chromium.org/7003146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_data_manager.cc')
| -rw-r--r-- | content/browser/gpu/gpu_data_manager.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc index e877a19..d36e9a6 100644 --- a/content/browser/gpu/gpu_data_manager.cc +++ b/content/browser/gpu/gpu_data_manager.cc @@ -70,8 +70,10 @@ Value* GpuDataManager::GetFeatureStatus() { const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); if (gpu_blacklist_.get()) return gpu_blacklist_->GetFeatureStatus(GpuAccessAllowed(), - browser_command_line.HasSwitch(switches::kDisableAcceleratedCompositing), - browser_command_line.HasSwitch(switches::kEnableAccelerated2dCanvas), + browser_command_line.HasSwitch( + switches::kDisableAcceleratedCompositing), + browser_command_line.HasSwitch( + switches::kDisableAccelerated2dCanvas), browser_command_line.HasSwitch(switches::kDisableExperimentalWebGL), browser_command_line.HasSwitch(switches::kDisableGLMultisampling)); return NULL; @@ -149,7 +151,8 @@ void GpuDataManager::AppendRendererCommandLine( if (flags & GpuFeatureFlags::kGpuFeatureAcceleratedCompositing) { const char* switches[] = { switches::kDisableAcceleratedCompositing, - switches::kDisableExperimentalWebGL + switches::kDisableExperimentalWebGL, + switches::kDisableAccelerated2dCanvas }; const int switch_count = sizeof(switches) / sizeof(char*); for (int i = 0; i < switch_count; ++i) { |