Index: ui/compositor/compositor.cc |
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc |
index 8b526ff0484d39f867cca661b5bc78acccd08e9d..93f683906f4c717bd5c7a6cde591fed069f15d3a 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) || |
sky
2015/06/29 02:20:27
nit: run git cl format
Jimmy Jo
2015/06/29 02:37:49
I already ran this script and there was no change.
danakj
2015/06/29 18:06:19
File a bug against clang-format in b/ then please.
danakj
2015/06/29 18:07:39
or, sorry, in crbug.com/, there's no template for
|
+ 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) |