| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index 2f071be20c20e05a2003a58ba4f0a8009e96da05..b51989a1242ea0efd903c4fb5892fcce382b7149 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -110,13 +110,11 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
|
| if (command_line->HasSwitch(switches::kDisableGpuVsync)) {
|
| std::string display_vsync_string =
|
| command_line->GetSwitchValueASCII(switches::kDisableGpuVsync);
|
| - if (display_vsync_string == "gpu") {
|
| + // See comments in gl_switches about this flag. The browser compositor
|
| + // is only unthrottled when "gpu" or no switch value is passed, as it
|
| + // is driven directly by the display compositor.
|
| + if (display_vsync_string != "beginframe") {
|
| settings.renderer_settings.disable_display_vsync = true;
|
| - } else if (display_vsync_string == "beginframe") {
|
| - settings.wait_for_beginframe_interval = false;
|
| - } else {
|
| - settings.renderer_settings.disable_display_vsync = true;
|
| - settings.wait_for_beginframe_interval = false;
|
| }
|
| }
|
| settings.renderer_settings.partial_swap_enabled =
|
|
|