Index: content/renderer/gpu/render_widget_compositor.cc |
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc |
index 0b50b6788fd0c7447299ebc92818e68cf7bb2edc..7f14845b4e6c57ee8f4cc4d9f6dd3a7628fce7af 100644 |
--- a/content/renderer/gpu/render_widget_compositor.cc |
+++ b/content/renderer/gpu/render_widget_compositor.cc |
@@ -224,8 +224,11 @@ void RenderWidgetCompositor::Initialize() { |
// to keep content always crisp when possible. |
settings.layer_transforms_should_scale_layer_contents = true; |
- settings.renderer_settings.disable_gpu_vsync = |
- cmd->HasSwitch(switches::kDisableGpuVsync); |
+ settings.renderer_settings.disable_display_vsync = |
+ (cmd->HasSwitch(switches::kDisableGpuVsync) |
+ ? true |
+ : !cmd->HasSwitch(cc::switches::kDisableDisplayVsync)); |
brianderson
2015/06/24 01:16:45
Can this (and elsehwere) be a simple OR:
cmd->Has
Jimmy Jo
2015/06/24 09:38:31
I misunderstood. When we turn on kDisableDisplayVs
|
+ |
settings.main_frame_before_activation_enabled = |
cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) && |
!cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation); |