cc: Use BeginFrameArgs

cc/output/output_surface_unittest.cc

 // Copyright 2013 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 "base/test/test_simple_task_runner.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "cc/test/scheduler_test_common.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class TestOutputSurface : public OutputSurface {
  public:
   explicit TestOutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D> context3d)
-      : OutputSurface(context3d.Pass()) {}
+      : OutputSurface(context3d.Pass()),
+        retroactive_begin_frame_deadline_enabled_(false) {}
 
   explicit TestOutputSurface(
       scoped_ptr<cc::SoftwareOutputDevice> software_device)
-      : OutputSurface(software_device.Pass()) {}
+      : OutputSurface(software_device.Pass()),
+        retroactive_begin_frame_deadline_enabled_(false) {}
 
   TestOutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
                     scoped_ptr<cc::SoftwareOutputDevice> software_device)
-      : OutputSurface(context3d.Pass(), software_device.Pass()) {}
+      : OutputSurface(context3d.Pass(), software_device.Pass()),
+        retroactive_begin_frame_deadline_enabled_(false) {}
 
   bool InitializeNewContext3D(
       scoped_ptr<WebKit::WebGraphicsContext3D> new_context3d) {
     return InitializeAndSetContext3D(new_context3d.Pass(),
                                      scoped_refptr<ContextProvider>());
   }
 
   bool HasClientForTesting() {
     return HasClient();
   }
@@ skipping 12 matching lines @@
   }
 
   int pending_swap_buffers() {
     return pending_swap_buffers_;
   }
 
   void OnSwapBuffersCompleteForTesting() {
     OnSwapBuffersComplete(NULL);
   }
 
-  void SetRetroactiveBeginFramePeriod(base::TimeDelta period) {
-    retroactive_begin_frame_period_ = period;
+  void EnableRetroactiveBeginFrameDeadline(bool enable) {
+    retroactive_begin_frame_deadline_enabled_ = enable;
   }
 
  protected:
   virtual void PostCheckForRetroactiveBeginFrame() OVERRIDE {
     // For testing purposes, we check immediately rather than posting a task.
     CheckForRetroactiveBeginFrame();
   }
 
-  virtual base::TimeDelta RetroactiveBeginFramePeriod() OVERRIDE {
-    return retroactive_begin_frame_period_;
+  virtual base::TimeTicks RetroactiveBeginFrameDeadline() OVERRIDE {
+    if (retroactive_begin_frame_deadline_enabled_)
+      return OutputSurface::RetroactiveBeginFrameDeadline();
+    return base::TimeTicks();
   }
 
-  base::TimeDelta retroactive_begin_frame_period_;
+  bool retroactive_begin_frame_deadline_enabled_;
 };
 
 class FakeOutputSurfaceClient : public OutputSurfaceClient {
  public:
   FakeOutputSurfaceClient()
       : begin_frame_count_(0),
         deferred_initialize_result_(true),
         deferred_initialize_called_(false),
         did_lose_output_surface_called_(false) {}
 
@@ skipping 144 matching lines @@
   bool throttle_frame_production = true;
   const base::TimeDelta display_refresh_interval =
       BeginFrameArgs::DefaultInterval();
 
   output_surface.InitializeBeginFrameEmulation(
       task_runner.get(),
       throttle_frame_production,
       display_refresh_interval);
 
   output_surface.SetMaxFramesPending(2);
-  output_surface.SetRetroactiveBeginFramePeriod(
-      base::TimeDelta::FromSeconds(-1));
+  output_surface.EnableRetroactiveBeginFrameDeadline(false);
 
   // We should start off with 0 BeginFrames
   EXPECT_EQ(client.begin_frame_count(), 0);
   EXPECT_EQ(output_surface.pending_swap_buffers(), 0);
 
   // We should not have a pending task until a BeginFrame has been requested.
   EXPECT_FALSE(task_runner->HasPendingTask());
   output_surface.SetNeedsBeginFrame(true);
   EXPECT_TRUE(task_runner->HasPendingTask());
 
@@ skipping 53 matching lines @@
   TestOutputSurface output_surface(
       context3d.PassAs<WebKit::WebGraphicsContext3D>());
   EXPECT_FALSE(output_surface.HasClientForTesting());
 
   FakeOutputSurfaceClient client;
   EXPECT_TRUE(output_surface.BindToClient(&client));
   EXPECT_TRUE(output_surface.HasClientForTesting());
   EXPECT_FALSE(client.deferred_initialize_called());
 
   output_surface.SetMaxFramesPending(2);
-
-  // Enable retroactive BeginFrames.
-  output_surface.SetRetroactiveBeginFramePeriod(
-    base::TimeDelta::FromSeconds(100000));
+  output_surface.EnableRetroactiveBeginFrameDeadline(true);
 
   // Optimistically injected BeginFrames should be throttled if
   // SetNeedsBeginFrame is false...
   output_surface.SetNeedsBeginFrame(false);
   output_surface.BeginFrameForTesting();
   EXPECT_EQ(client.begin_frame_count(), 0);
   // ...and retroactively triggered by a SetNeedsBeginFrame.
   output_surface.SetNeedsBeginFrame(true);
   EXPECT_EQ(client.begin_frame_count(), 1);
 
@@ skipping 18 matching lines @@
   EXPECT_EQ(output_surface.pending_swap_buffers(), 2);
   output_surface.BeginFrameForTesting();
   EXPECT_EQ(client.begin_frame_count(), 3);
   // ...and retroactively triggered by OnSwapBuffersComplete
   output_surface.OnSwapBuffersCompleteForTesting();
   EXPECT_EQ(client.begin_frame_count(), 4);
 }
 
 }  // namespace
 }  // namespace cc