diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 21:15:08 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 21:15:08 +0000 |
| commit | d7fbfb01138a20997a341ad4408bc66c4c980889 (patch) | |
| tree | d5add891b80a3b1a699d0a3a8c461c536b524d6f /content/browser/compositor | |
| parent | 9eb6ff048814910fe4cbae4e8c5f50805fd90f40 (diff) | |
| download | chromium_src-d7fbfb01138a20997a341ad4408bc66c4c980889.zip chromium_src-d7fbfb01138a20997a341ad4408bc66c4c980889.tar.gz chromium_src-d7fbfb01138a20997a341ad4408bc66c4c980889.tar.bz2 | |
Remove --ui-enable-software-compositing flag.
This flag is redundant with --disable-gpu which causes us to fall into
software compositing mode.
Depends on: https://codereview.chromium.org/167973003/
R=piman@chromium.org, piman
BUG=
Review URL: https://codereview.chromium.org/166163007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/compositor')
| -rw-r--r-- | content/browser/compositor/gpu_process_transport_factory.cc | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc index 6724060..6d3ed15 100644 --- a/content/browser/compositor/gpu_process_transport_factory.cc +++ b/content/browser/compositor/gpu_process_transport_factory.cc @@ -179,24 +179,19 @@ scoped_ptr<cc::OutputSurface> GpuProcessTransportFactory::CreateOutputSurface( if (!data) data = CreatePerCompositorData(compositor); - bool force_software_renderer = false; -#if defined(OS_WIN) + bool create_software_renderer = software_fallback; +#if defined(OS_CHROMEOS) + // Software fallback does not happen on Chrome OS. + create_software_renderer = false; +#elif defined(OS_WIN) if (::GetProp(compositor->widget(), kForceSoftwareCompositor)) { - force_software_renderer = reinterpret_cast<bool>( - ::RemoveProp(compositor->widget(), kForceSoftwareCompositor)); + if (::RemoveProp(compositor->widget(), kForceSoftwareCompositor)) + create_software_renderer = true; } #endif scoped_refptr<ContextProviderCommandBuffer> context_provider; - - // Software fallback does not happen on Chrome OS. -#if defined(OS_CHROMEOS) - software_fallback = false; -#endif - - CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (!command_line->HasSwitch(switches::kUIEnableSoftwareCompositing) && - !force_software_renderer && !software_fallback) { + if (!create_software_renderer) { context_provider = ContextProviderCommandBuffer::Create( GpuProcessTransportFactory::CreateContextCommon(data->surface_id), "Compositor"); |