Hook up DidReceiveInputEvent to the blink scheduler

content/renderer/scheduler/renderer_scheduler_impl_unittest.cc

 // Copyright 2014 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 "content/renderer/scheduler/renderer_scheduler_impl.h"
 
 #include "base/callback.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/test/ordered_simple_task_runner.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 119 matching lines @@
 
 void PostingYieldingTestTask(
     RendererSchedulerImpl* scheduler,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     bool simulate_input,
     bool* should_yield_before,
     bool* should_yield_after) {
   *should_yield_before = scheduler->ShouldYieldForHighPriorityWork();
   task_runner->PostTask(FROM_HERE, base::Bind(NullTask));
   if (simulate_input) {
-    scheduler->DidReceiveInputEventOnCompositorThread();
+    scheduler->DidReceiveInputEventOnCompositorThread(
+        blink::WebInputEvent::GestureFlingStart);
   }
   *should_yield_after = scheduler->ShouldYieldForHighPriorityWork();
 }
 
 TEST_F(RendererSchedulerImplTest, TestPostDefaultTask) {
   int result = 0;
   default_task_runner_->PostTask(FROM_HERE,
                                  base::Bind(OrderedTestTask, 1, &result));
   default_task_runner_->PostTask(FROM_HERE,
                                  base::Bind(OrderedTestTask, 2, &result));
@@ skipping 140 matching lines @@
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("C1")));
   default_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("D2")));
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("C2")));
 
-  scheduler_->DidReceiveInputEventOnCompositorThread();
+  scheduler_->DidReceiveInputEventOnCompositorThread(
+      blink::WebInputEvent::GestureFlingStart);
   EnableIdleTasks();
   RunUntilIdle();
   EXPECT_THAT(order, testing::ElementsAre(std::string("C1"), std::string("C2"),
+                                          std::string("D1"), std::string("D2"),
+                                          std::string("I1")));
+}
+
+TEST_F(RendererSchedulerImplTest, TestCompositorPolicy_DidAnimateForInput) {
+  std::vector<std::string> order;
+
+  idle_task_runner_->PostIdleTask(
+      FROM_HERE,
+      base::Bind(&AppendToVectorIdleTestTask, &order, std::string("I1")));
+  default_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&AppendToVectorTestTask, &order, std::string("D1")));
+  compositor_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&AppendToVectorTestTask, &order, std::string("C1")));
+  default_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&AppendToVectorTestTask, &order, std::string("D2")));
+  compositor_task_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&AppendToVectorTestTask, &order, std::string("C2")));
+
+  scheduler_->DidAnimateForInputOnCompositorThread();
+  EnableIdleTasks();
+  RunUntilIdle();
+  EXPECT_THAT(order, testing::ElementsAre(std::string("C1"), std::string("C2"),
                                           std::string("D1"), std::string("D2"),
                                           std::string("I1")));
 }
 
 TEST_F(RendererSchedulerImplTest,
        TestCompositorPolicyDoesNotStarveDefaultTasks) {
   std::vector<std::string> order;
 
   default_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("D1")));
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("C1")));
   for (int i = 0; i < 20; i++) {
     compositor_task_runner_->PostTask(FROM_HERE, base::Bind(&NullTask));
   }
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("C2")));
 
-  scheduler_->DidReceiveInputEventOnCompositorThread();
+  scheduler_->DidReceiveInputEventOnCompositorThread(
+      blink::WebInputEvent::GestureFlingStart);
   RunUntilIdle();
   // Ensure that the default D1 task gets to run at some point before the final
   // C2 compositor task.
   EXPECT_THAT(order, testing::ElementsAre(std::string("C1"), std::string("D1"),
                                           std::string("C2")));
 }
 
 TEST_F(RendererSchedulerImplTest, TestCompositorPolicyEnds) {
   std::vector<std::string> order;
 
   default_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("D1")));
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("C1")));
   default_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("D2")));
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AppendToVectorTestTask, &order, std::string("C2")));
 
-  scheduler_->DidReceiveInputEventOnCompositorThread();
+  scheduler_->DidReceiveInputEventOnCompositorThread(
+      blink::WebInputEvent::GestureFlingStart);
   RunUntilIdle();
   EXPECT_THAT(order,
               testing::ElementsAre(std::string("C1"), std::string("C2"),
                                    std::string("D1"), std::string("D2")));
 
   order.clear();
   clock_->AdvanceNow(base::TimeDelta::FromMilliseconds(1000));
 
   default_task_runner_->PostTask(
       FROM_HERE,
@@ skipping 41 matching lines @@
       FROM_HERE, base::Bind(&PostingYieldingTestTask, scheduler_.get(),
                             compositor_task_runner_, true, &should_yield_before,
                             &should_yield_after));
   RunUntilIdle();
   // We should be able to switch to compositor priority mid-task.
   EXPECT_FALSE(should_yield_before);
   EXPECT_TRUE(should_yield_after);
 }
 
 }  // namespace content