| Index: ui/compositor/compositor.cc
 | 
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
 | 
| index 8b526ff0484d39f867cca661b5bc78acccd08e9d..2b40a875cba2f691436ccf9a42012f2cc27befd5 100644
 | 
| --- a/ui/compositor/compositor.cc
 | 
| +++ b/ui/compositor/compositor.cc
 | 
| @@ -94,8 +94,13 @@ Compositor::Compositor(gfx::AcceleratedWidget widget,
 | 
|        context_factory_->DoesCreateTestContexts() ? kTestRefreshRate
 | 
|                                                   : kDefaultRefreshRate;
 | 
|    settings.main_frame_before_activation_enabled = false;
 | 
| -  settings.renderer_settings.disable_gpu_vsync =
 | 
| -      command_line->HasSwitch(switches::kDisableGpuVsync);
 | 
| +  settings.renderer_settings.disable_display_vsync =
 | 
| +      (command_line->HasSwitch(switches::kDisableGpuVsync) ||
 | 
| +       command_line->HasSwitch(switches::kDisableDisplayVsync));
 | 
| +  settings.throttle_frame_production =
 | 
| +      !(command_line->HasSwitch(switches::kDisableGpuVsync) ||
 | 
| +        command_line->HasSwitch(cc::switches::kDisableBeginFrameInterval));
 | 
| +
 | 
|    settings.renderer_settings.partial_swap_enabled =
 | 
|        !command_line->HasSwitch(cc::switches::kUIDisablePartialSwap);
 | 
|  #if defined(OS_CHROMEOS)
 | 
| 
 |