cc: Rename VSync to BeginFrame

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 <vector>
 
 #include "base/logging.h"
 #include "cc/test/scheduler_test_common.h"
@@ skipping 25 matching lines @@
   }
 
   void SetDrawWillHappen(bool draw_will_happen) {
     draw_will_happen_ = draw_will_happen;
   }
   void SetSwapWillHappenIfDrawHappens(bool swap_will_happen_if_draw_happens) {
     swap_will_happen_if_draw_happens_ = swap_will_happen_if_draw_happens;
   }
 
   // Scheduler Implementation.
-  virtual void ScheduledActionBeginFrame() OVERRIDE {
-    actions_.push_back("ScheduledActionBeginFrame");
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE {
+    actions_.push_back("ScheduledActionBeginMainFrame");
   }
   virtual ScheduledActionDrawAndSwapResult
   ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
     actions_.push_back("ScheduledActionDrawAndSwapIfPossible");
     num_draws_++;
     return ScheduledActionDrawAndSwapResult(draw_will_happen_,
                                             draw_will_happen_ &&
                                             swap_will_happen_if_draw_happens_);
   }
   virtual ScheduledActionDrawAndSwapResult ScheduledActionDrawAndSwapForced()
@@ skipping 39 matching lines @@
   scheduler->SetCanDraw(true);
 
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionBeginOutputSurfaceCreation", client.Action(0));
   client.Reset();
   scheduler->DidCreateAndInitializeOutputSurface();
 
   // SetNeedsCommit should begin the frame.
   scheduler->SetNeedsCommit();
   EXPECT_EQ(1, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   EXPECT_FALSE(time_source->Active());
   client.Reset();
 
-  // BeginFrameComplete should commit
-  scheduler->BeginFrameComplete();
+  // BeginMainFrameComplete should commit
+  scheduler->BeginMainFrameComplete();
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionCommit", client.Action(0));
   EXPECT_TRUE(time_source->Active());
   client.Reset();
 
   // Tick should draw.
   time_source->Tick();
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionDrawAndSwapIfPossible", client.Action(0));
   EXPECT_FALSE(time_source->Active());
   client.Reset();
 
   // Timer should be off.
   EXPECT_FALSE(time_source->Active());
 }
 
-TEST(SchedulerTest, RequestCommitAfterBeginFrame) {
+TEST(SchedulerTest, RequestCommitAfterBeginMainFrame) {
   FakeSchedulerClient client;
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   SchedulerSettings default_scheduler_settings;
   scoped_ptr<Scheduler> scheduler =
       Scheduler::Create(&client,
                         make_scoped_ptr(new FrameRateController(time_source)),
                         default_scheduler_settings);
   scheduler->SetCanStart();
   scheduler->SetVisible(true);
   scheduler->SetCanDraw(true);
 
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionBeginOutputSurfaceCreation", client.Action(0));
   client.Reset();
   scheduler->DidCreateAndInitializeOutputSurface();
 
   // SetNedsCommit should begin the frame.
   scheduler->SetNeedsCommit();
   EXPECT_EQ(1, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   client.Reset();
 
   // Now SetNeedsCommit again. Calling here means we need a second frame.
   scheduler->SetNeedsCommit();
 
-  // Since, another commit is needed, BeginFrameComplete should commit,
+  // Since, another commit is needed, BeginMainFrameComplete should commit,
   // then begin another frame.
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionCommit", client.Action(0));
   client.Reset();
 
   // Tick should draw but then begin another frame.
   time_source->Tick();
   EXPECT_FALSE(time_source->Active());
   EXPECT_EQ(2, client.num_actions_());
   EXPECT_STREQ("ScheduledActionDrawAndSwapIfPossible", client.Action(0));
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(1));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(1));
   client.Reset();
 }
 
 TEST(SchedulerTest, TextureAcquisitionCollision) {
   FakeSchedulerClient client;
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   SchedulerSettings default_scheduler_settings;
   scoped_ptr<Scheduler> scheduler =
       Scheduler::Create(&client,
                         make_scoped_ptr(new FrameRateController(time_source)),
                         default_scheduler_settings);
   scheduler->SetCanStart();
   scheduler->SetVisible(true);
   scheduler->SetCanDraw(true);
 
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionBeginOutputSurfaceCreation", client.Action(0));
   client.Reset();
   scheduler->DidCreateAndInitializeOutputSurface();
 
   scheduler->SetNeedsCommit();
   scheduler->SetMainThreadNeedsLayerTextures();
   EXPECT_EQ(2, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   EXPECT_STREQ("ScheduledActionAcquireLayerTexturesForMainThread",
                client.Action(1));
   client.Reset();
 
   // Compositor not scheduled to draw because textures are locked by main thread
   EXPECT_FALSE(time_source->Active());
 
   // Trigger the commit
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
   EXPECT_TRUE(time_source->Active());
   client.Reset();
 
   // Between commit and draw, texture acquisition for main thread delayed,
   // and main thread blocks.
   scheduler->SetMainThreadNeedsLayerTextures();
   EXPECT_EQ(0, client.num_actions_());
   client.Reset();
 
   // Once compositor draw complete, the delayed texture acquisition fires.
   time_source->Tick();
   EXPECT_EQ(3, client.num_actions_());
   EXPECT_STREQ("ScheduledActionDrawAndSwapIfPossible", client.Action(0));
   EXPECT_STREQ("ScheduledActionAcquireLayerTexturesForMainThread",
                client.Action(1));
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(2));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(2));
   client.Reset();
 }
 
 TEST(SchedulerTest, VisibilitySwitchWithTextureAcquisition) {
   FakeSchedulerClient client;
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   SchedulerSettings default_scheduler_settings;
   scoped_ptr<Scheduler> scheduler =
       Scheduler::Create(&client,
                         make_scoped_ptr(new FrameRateController(time_source)),
                         default_scheduler_settings);
   scheduler->SetCanStart();
   scheduler->SetVisible(true);
   scheduler->SetCanDraw(true);
 
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionBeginOutputSurfaceCreation", client.Action(0));
   client.Reset();
   scheduler->DidCreateAndInitializeOutputSurface();
 
   scheduler->SetNeedsCommit();
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
   scheduler->SetMainThreadNeedsLayerTextures();
   client.Reset();
   // Verify that pending texture acquisition fires when visibility
   // is lost in order to avoid a deadlock.
   scheduler->SetVisible(false);
   EXPECT_EQ(1, client.num_actions_());
   EXPECT_STREQ("ScheduledActionAcquireLayerTexturesForMainThread",
                client.Action(0));
   client.Reset();
 
   // Regaining visibility with textures acquired by main thread while
   // compositor is waiting for first draw should result in a request
   // for a new frame in order to escape a deadlock.
   scheduler->SetVisible(true);
   EXPECT_EQ(1, client.num_actions_());
-  EXPECT_STREQ("ScheduledActionBeginFrame", client.Action(0));
+  EXPECT_STREQ("ScheduledActionBeginMainFrame", client.Action(0));
   client.Reset();
 }
 
 class SchedulerClientThatsetNeedsDrawInsideDraw : public FakeSchedulerClient {
  public:
   SchedulerClientThatsetNeedsDrawInsideDraw() : scheduler_(NULL) {}
 
   void SetScheduler(Scheduler* scheduler) { scheduler_ = scheduler; }
 
-  virtual void ScheduledActionBeginFrame() OVERRIDE {}
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE {}
   virtual ScheduledActionDrawAndSwapResult
   ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
     // Only SetNeedsRedraw the first time this is called
     if (!num_draws_)
       scheduler_->SetNeedsRedraw();
     return FakeSchedulerClient::ScheduledActionDrawAndSwapIfPossible();
   }
 
   virtual ScheduledActionDrawAndSwapResult ScheduledActionDrawAndSwapForced()
       OVERRIDE {
@@ skipping 90 matching lines @@
   EXPECT_FALSE(scheduler->RedrawPending());
   EXPECT_FALSE(time_source->Active());
 }
 
 class SchedulerClientThatsetNeedsCommitInsideDraw : public FakeSchedulerClient {
  public:
   SchedulerClientThatsetNeedsCommitInsideDraw() : scheduler_(NULL) {}
 
   void SetScheduler(Scheduler* scheduler) { scheduler_ = scheduler; }
 
-  virtual void ScheduledActionBeginFrame() OVERRIDE {}
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE {}
   virtual ScheduledActionDrawAndSwapResult
   ScheduledActionDrawAndSwapIfPossible() OVERRIDE {
     // Only SetNeedsCommit the first time this is called
     if (!num_draws_)
       scheduler_->SetNeedsCommit();
     return FakeSchedulerClient::ScheduledActionDrawAndSwapIfPossible();
   }
 
   virtual ScheduledActionDrawAndSwapResult ScheduledActionDrawAndSwapForced()
       OVERRIDE {
@@ skipping 27 matching lines @@
 
   scheduler->SetNeedsRedraw();
   EXPECT_TRUE(scheduler->RedrawPending());
   EXPECT_EQ(0, client.num_draws());
   EXPECT_TRUE(time_source->Active());
 
   time_source->Tick();
   EXPECT_FALSE(time_source->Active());
   EXPECT_EQ(1, client.num_draws());
   EXPECT_TRUE(scheduler->CommitPending());
-  scheduler->BeginFrameComplete();
+  scheduler->BeginMainFrameComplete();
 
   time_source->Tick();
   EXPECT_EQ(2, client.num_draws());
   EXPECT_FALSE(time_source->Active());
   EXPECT_FALSE(scheduler->RedrawPending());
 }
 
 // Tests that when a draw fails then the pending commit should not be dropped.
 TEST(SchedulerTest, RequestCommitInsideFailedDraw) {
   SchedulerClientThatsetNeedsDrawInsideDraw client;
@@ skipping 35 matching lines @@
 
   // Draw successfully.
   client.SetDrawWillHappen(true);
   time_source->Tick();
   EXPECT_EQ(3, client.num_draws());
   EXPECT_TRUE(scheduler->CommitPending());
   EXPECT_FALSE(scheduler->RedrawPending());
   EXPECT_FALSE(time_source->Active());
 }
 
-TEST(SchedulerTest, NoBeginFrameWhenDrawFails) {
+TEST(SchedulerTest, NoSwapWhenDrawFails) {
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   SchedulerClientThatsetNeedsCommitInsideDraw client;
   scoped_ptr<FakeFrameRateController> controller(
       new FakeFrameRateController(time_source));
   FakeFrameRateController* controller_ptr = controller.get();
   SchedulerSettings default_scheduler_settings;
   scoped_ptr<Scheduler> scheduler =
       Scheduler::Create(&client,
                         controller.PassAs<FrameRateController>(),
                         default_scheduler_settings);
@@ skipping 21 matching lines @@
   EXPECT_TRUE(scheduler->RedrawPending());
   EXPECT_TRUE(time_source->Active());
 
   // Fail to draw, this should not start a frame.
   client.SetDrawWillHappen(false);
   time_source->Tick();
   EXPECT_EQ(2, client.num_draws());
   EXPECT_EQ(0, controller_ptr->NumFramesPending());
 }
 
-TEST(SchedulerTest, NoBeginFrameWhenSwapFailsDuringForcedCommit) {
+TEST(SchedulerTest, NoSwapWhenSwapFailsDuringForcedCommit) {
   scoped_refptr<FakeTimeSource> time_source(new FakeTimeSource());
   FakeSchedulerClient client;
   scoped_ptr<FakeFrameRateController> controller(
       new FakeFrameRateController(time_source));
   FakeFrameRateController* controller_ptr = controller.get();
   SchedulerSettings default_scheduler_settings;
   scoped_ptr<Scheduler> scheduler =
       Scheduler::Create(&client,
                         controller.PassAs<FrameRateController>(),
                         default_scheduler_settings);
@@ skipping 38 matching lines @@
   scheduler->DidLoseOutputSurface();
   // Verifying that it's 1 so that we know that it's reset on recreate.
   EXPECT_EQ(1, controller_ptr->NumFramesPending());
 
   scheduler->DidCreateAndInitializeOutputSurface();
   EXPECT_EQ(0, controller_ptr->NumFramesPending());
 }
 
 }  // namespace
 }  // namespace cc