| 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..fabfd35bbfd6cec7a117682d651805d89154012a 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -224,8 +224,13 @@ 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) ||
|
| + cmd->HasSwitch(switches::kDisableDisplayVsync));
|
| + settings.throttle_frame_production =
|
| + !(cmd->HasSwitch(switches::kDisableGpuVsync) ||
|
| + cmd->HasSwitch(cc::switches::kDisableBeginFrameInterval));
|
| +
|
| settings.main_frame_before_activation_enabled =
|
| cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
|
| !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);
|
|
|