cc: Make scheduling be driven by vsync for android webview.

cc/scheduler/scheduler_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/scheduler/scheduler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/debug/trace_event.h"
@@ skipping 249 matching lines @@
     states_.push_back(scheduler_->AsValue());
   }
   void ScheduledActionBeginOutputSurfaceCreation() override {
     actions_.push_back("ScheduledActionBeginOutputSurfaceCreation");
     states_.push_back(scheduler_->AsValue());
   }
   void ScheduledActionPrepareTiles() override {
     actions_.push_back("ScheduledActionPrepareTiles");
     states_.push_back(scheduler_->AsValue());
   }
+  void ScheduledActionInvalidateOutputSurface() override {
+    actions_.push_back("ScheduledActionInvalidateOutputSurface");
+    states_.push_back(scheduler_->AsValue());
+  }
   void DidAnticipatedDrawTimeChange(base::TimeTicks) override {
     if (log_anticipated_draw_time_change_)
       actions_.push_back("DidAnticipatedDrawTimeChange");
   }
   base::TimeDelta DrawDurationEstimate() override { return base::TimeDelta(); }
   base::TimeDelta BeginMainFrameToCommitDurationEstimate() override {
     return base::TimeDelta();
   }
   base::TimeDelta CommitToActivateDurationEstimate() override {
     return base::TimeDelta();
@@ skipping 47 matching lines @@
   scheduler->NotifyBeginMainFrameStarted();
   scheduler->NotifyReadyToCommit();
   if (scheduler->settings().impl_side_painting)
     scheduler->NotifyReadyToActivate();
 
   {
     SCOPED_TRACE("Go through the motions to draw the commit");
     client->AdvanceFrame();
   }
 
-  // Run the posted deadline task.
   EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
-  client->task_runner().RunTasksWhile(client->ImplFrameDeadlinePending(true));
+  if (scheduler->settings().using_synchronous_renderer_compositor) {
+    // Trigger deadline synchronously.
+    scheduler->OutputSurfaceDidRequestDraw();
+  } else {
+    // Run the posted deadline task.
+    client->task_runner().RunTasksWhile(client->ImplFrameDeadlinePending(true));
+  }
   EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
 
   {
     SCOPED_TRACE(
         "We need another BeginImplFrame so Scheduler calls "
         "SetNeedsBeginFrame(false).");
     client->AdvanceFrame();
   }
 
   // Run the posted deadline task.
@@ skipping 1927 matching lines @@
   // Disable auto-advancing of now_src
   client.task_runner().SetAutoAdvanceNowToPendingTasks(false);
 
   // Deadline task is pending
   EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
   client.task_runner().RunPendingTasks();
   // Deadline task runs immediately
   EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
 }
 
+TEST(SchedulerTest, UsingSynchronousCompositor) {
+  FakeSchedulerClient client;
+  SchedulerSettings settings;
+  settings.using_synchronous_renderer_compositor = true;
+  settings.use_external_begin_frame_source = true;
+  TestScheduler* scheduler = client.CreateScheduler(settings);
+
+  scheduler->SetCanStart();
+  scheduler->SetVisible(true);
+  scheduler->SetCanDraw(true);
+
+  InitializeOutputSurfaceAndFirstCommit(scheduler, &client);
+  client.Reset();
+
+  // Static page. Scrolling initiated by webview. OnDraw comes in time.
+  scheduler->SetNeedsRedraw();
+  // Ask for BeginFrames.
+  EXPECT_SINGLE_ACTION("SetNeedsBeginFrames(true)", client);
+  client.Reset();
+
+  client.SendNextBeginFrame();
+  EXPECT_ACTION("WillBeginImplFrame", client, 0, 3);
+  EXPECT_ACTION("ScheduledActionAnimate", client, 1, 3);
+  EXPECT_ACTION("ScheduledActionInvalidateOutputSurface", client, 2, 3);
+  EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
+  client.Reset();
+
+  // Android onDraw.
+  scheduler->SetNeedsRedraw();
+  scheduler->OutputSurfaceDidRequestDraw();
+  EXPECT_SINGLE_ACTION("ScheduledActionDrawAndSwapIfPossible", client);
+  EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
+  client.Reset();
+
+  // It takes one more frame to call SetNeedsBeginFrames(false).
+  client.AdvanceFrame();
+  EXPECT_SINGLE_ACTION("WillBeginImplFrame", client);
+  EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
+  client.Reset();
+
+  client.task_runner().RunTasksWhile(client.ImplFrameDeadlinePending(true));
+  EXPECT_SINGLE_ACTION("SetNeedsBeginFrames(false)", client);
+  EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
+  client.Reset();
+
+  // Static page. Scrolling initiated by webview. OnDraw does not come in time.
+  scheduler->SetNeedsRedraw();
+  // Ask for BeginFrames.
+  EXPECT_SINGLE_ACTION("SetNeedsBeginFrames(true)", client);
+  client.Reset();
+
+  client.SendNextBeginFrame();
+  EXPECT_ACTION("WillBeginImplFrame", client, 0, 3);
+  EXPECT_ACTION("ScheduledActionAnimate", client, 1, 3);
+  EXPECT_ACTION("ScheduledActionInvalidateOutputSurface", client, 2, 3);
+  EXPECT_TRUE(scheduler->BeginImplFrameDeadlinePending());
+  client.Reset();
+
+  // No onDraw => no draw action by the scheduler.
+  client.task_runner().RunUntilTime(client.now_src()->Now());
+  EXPECT_NO_ACTION(client);
+  EXPECT_FALSE(scheduler->BeginImplFrameDeadlinePending());
+}
+
 }  // namespace
 }  // namespace cc