[cc] Also disable latency recovery in full-pipe mode.

In full-pipe mode, we don't want to skip BeginFrames.

Bug: 646774
Change-Id: Ibc1ed9a7e9866d150f4f16755a824b22d4586e29
Reviewed-on: https://chromium-review.googlesource.com/749383Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513167}

content/renderer/gpu/render_widget_compositor.cc

@@ -584,8 +584,10 @@ cc::LayerTreeSettings RenderWidgetCompositor::GenerateLayerTreeSettings(
   settings.disallow_non_exact_resource_reuse =
       cmd.HasSwitch(switches::kDisallowNonExactResourceReuse);
 
-  settings.wait_for_all_pipeline_stages_before_draw =
-      cmd.HasSwitch(cc::switches::kRunAllCompositorStagesBeforeDraw);
+  if (cmd.HasSwitch(cc::switches::kRunAllCompositorStagesBeforeDraw)) {
+    settings.wait_for_all_pipeline_stages_before_draw = true;
+    settings.enable_latency_recovery = false;
+  }
 
   settings.enable_image_animations =
       cmd.HasSwitch(switches::kEnableCompositorImageAnimations);

ui/compositor/compositor.cc

@@ -182,8 +182,11 @@ Compositor::Compositor(const viz::FrameSinkId& frame_sink_id,
   settings.disallow_non_exact_resource_reuse =
       command_line->HasSwitch(switches::kDisallowNonExactResourceReuse);
 
-  settings.wait_for_all_pipeline_stages_before_draw =
-      command_line->HasSwitch(cc::switches::kRunAllCompositorStagesBeforeDraw);
+  if (command_line->HasSwitch(
+          cc::switches::kRunAllCompositorStagesBeforeDraw)) {
+    settings.wait_for_all_pipeline_stages_before_draw = true;
+    settings.enable_latency_recovery = false;
+  }
 
   base::TimeTicks before_create = base::TimeTicks::Now();