diff options
author | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-08 00:41:39 +0000 |
---|---|---|
committer | kbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-08 00:41:39 +0000 |
commit | 48c3d0238cde6f2fe9c2c38016e3fdbc22a869f0 (patch) | |
tree | ba427680595bb8c896150c0c3a02a907764114df /content/browser | |
parent | 7202d06cebef07abf8f568dcc0788da8d2f47987 (diff) | |
download | chromium_src-48c3d0238cde6f2fe9c2c38016e3fdbc22a869f0.zip chromium_src-48c3d0238cde6f2fe9c2c38016e3fdbc22a869f0.tar.gz chromium_src-48c3d0238cde6f2fe9c2c38016e3fdbc22a869f0.tar.bz2 |
Revert 255481 "Remove --ui-prioritize-in-gpu-process"
Reverting to see whether this introduced flakiness in the WebGL conformance
tests on the Win GPU bots. If it did, that means this CL exposed a
preexisting race condition. See Issue 350572.
> Remove --ui-prioritize-in-gpu-process
>
> It is already always on on Android and Chrome OS. Consensus is that we should
> turn on on all Aura platform. The flag is a noop on other platforms.
>
> BUG=344083
>
> Review URL: https://codereview.chromium.org/183883023
TBR=piman@chromium.org
BUG=344083,350572
Review URL: https://codereview.chromium.org/189373012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r-- | content/browser/android/content_startup_flags.cc | 2 | ||||
-rw-r--r-- | content/browser/gpu/gpu_process_host.cc | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc index fc6b3d2..fc413d3 100644 --- a/content/browser/android/content_startup_flags.cc +++ b/content/browser/android/content_startup_flags.cc @@ -89,6 +89,8 @@ void SetContentCommandLineFlags(int max_render_process_count, parsed_command_line->AppendSwitch( cc::switches::kDisableCompositedAntialiasing); + parsed_command_line->AppendSwitch(switches::kUIPrioritizeInGpuProcess); + parsed_command_line->AppendSwitch(switches::kEnableDelegatedRenderer); if (!plugin_descriptor.empty()) { diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index a797e76..8c7a882 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -1105,6 +1105,9 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) { #if defined(OS_CHROMEOS) chromeos::switches::kGpuSandboxFailuresNonfatal, #endif +#if defined(USE_AURA) + switches::kUIPrioritizeInGpuProcess, +#endif #if defined(USE_OZONE) switches::kOzonePlatform, #endif |