cc: Implement deadline scheduling disabled by default

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 "cc/output/output_surface.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "cc/debug/test_context_provider.h"
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/software_output_device.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/scheduler_test_common.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class TestOutputSurface : public OutputSurface {
  public:
   explicit TestOutputSurface(scoped_refptr<ContextProvider> context_provider)
-      : OutputSurface(context_provider) {}
+      : OutputSurface(context_provider),
+        retroactive_begin_frame_deadline_enabled_(false),
+        override_retroactive_period_(false) {}
 
   explicit TestOutputSurface(
       scoped_ptr<cc::SoftwareOutputDevice> software_device)
-      : OutputSurface(software_device.Pass()) {}
+      : OutputSurface(software_device.Pass()),
+        retroactive_begin_frame_deadline_enabled_(false),
+        override_retroactive_period_(false) {}
 
   TestOutputSurface(scoped_refptr<ContextProvider> context_provider,
                     scoped_ptr<cc::SoftwareOutputDevice> software_device)
-      : OutputSurface(context_provider, software_device.Pass()) {}
+      : OutputSurface(context_provider, software_device.Pass()),
+        retroactive_begin_frame_deadline_enabled_(false),
+        override_retroactive_period_(false) {}
 
   bool InitializeNewContext3d(
       scoped_refptr<ContextProvider> new_context_provider) {
     return InitializeAndSetContext3d(new_context_provider,
                                      scoped_refptr<ContextProvider>());
   }
 
   using OutputSurface::ReleaseGL;
 
   void OnVSyncParametersChangedForTesting(base::TimeTicks timebase,
@@ skipping 10 matching lines @@
   }
 
   int pending_swap_buffers() {
     return pending_swap_buffers_;
   }
 
   void OnSwapBuffersCompleteForTesting() {
     OnSwapBuffersComplete();
   }
 
-  void SetAlternateRetroactiveBeginFramePeriod(base::TimeDelta period) {
-    alternate_retroactive_begin_frame_period_ = period;
+  void EnableRetroactiveBeginFrameDeadline(bool enable,
+                                           bool override_retroactive_period,
+                                           base::TimeDelta period_override) {
+    retroactive_begin_frame_deadline_enabled_ = enable;
+    override_retroactive_period_ = override_retroactive_period;
+    retroactive_period_override_ = period_override;
   }
 
  protected:
   virtual void PostCheckForRetroactiveBeginFrame() OVERRIDE {
     // For testing purposes, we check immediately rather than posting a task.
     CheckForRetroactiveBeginFrame();
   }
 
-  virtual base::TimeDelta AlternateRetroactiveBeginFramePeriod() OVERRIDE {
-    return alternate_retroactive_begin_frame_period_;
+  virtual base::TimeTicks RetroactiveBeginFrameDeadline() OVERRIDE {
+    if (retroactive_begin_frame_deadline_enabled_) {
+      if (override_retroactive_period_) {
+        return skipped_begin_frame_args_.frame_time +
+               retroactive_period_override_;
+      } else {
+        return OutputSurface::RetroactiveBeginFrameDeadline();
+      }
+    }
+    return base::TimeTicks();
   }
 
-  base::TimeDelta alternate_retroactive_begin_frame_period_;
+  bool retroactive_begin_frame_deadline_enabled_;
+  bool override_retroactive_period_;
+  base::TimeDelta retroactive_period_override_;
 };
 
 class TestSoftwareOutputDevice : public SoftwareOutputDevice {
  public:
   TestSoftwareOutputDevice();
   virtual ~TestSoftwareOutputDevice();
 
   // Overriden from cc:SoftwareOutputDevice
   virtual void DiscardBackbuffer() OVERRIDE;
   virtual void EnsureBackbuffer() OVERRIDE;
@@ skipping 124 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.SetAlternateRetroactiveBeginFramePeriod(
-      base::TimeDelta::FromSeconds(-1));
+  output_surface.EnableRetroactiveBeginFrameDeadline(
+      false, false, base::TimeDelta());
 
   // 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 52 matching lines @@
 TEST(OutputSurfaceTest, OptimisticAndRetroactiveBeginFrames) {
   TestOutputSurface output_surface(TestContextProvider::Create());
   EXPECT_FALSE(output_surface.HasClient());
 
   FakeOutputSurfaceClient client;
   EXPECT_TRUE(output_surface.BindToClient(&client));
   EXPECT_TRUE(output_surface.HasClient());
   EXPECT_FALSE(client.deferred_initialize_called());
 
   output_surface.SetMaxFramesPending(2);
-
-  // Enable retroactive BeginFrames.
-  output_surface.SetAlternateRetroactiveBeginFramePeriod(
-    base::TimeDelta::FromSeconds(100000));
+  output_surface.EnableRetroactiveBeginFrameDeadline(
+      true, false, base::TimeDelta());
 
   // 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 30 matching lines @@
       TestContextProvider::Create();
 
   TestOutputSurface output_surface(context_provider);
   EXPECT_FALSE(output_surface.HasClient());
 
   FakeOutputSurfaceClient client;
   EXPECT_TRUE(output_surface.BindToClient(&client));
   EXPECT_TRUE(output_surface.HasClient());
   EXPECT_FALSE(client.deferred_initialize_called());
 
-  base::TimeDelta big_interval = base::TimeDelta::FromSeconds(1000);
+  base::TimeDelta big_interval = base::TimeDelta::FromSeconds(10);
 
   // Initialize BeginFrame emulation
   scoped_refptr<base::TestSimpleTaskRunner> task_runner =
       new base::TestSimpleTaskRunner;
   bool throttle_frame_production = true;
   const base::TimeDelta display_refresh_interval = big_interval;
 
   output_surface.InitializeBeginFrameEmulation(
       task_runner.get(),
       throttle_frame_production,
       display_refresh_interval);
 
   // We need to subtract an epsilon from Now() because some platforms have
   // a slow clock.
   output_surface.OnVSyncParametersChangedForTesting(
-      base::TimeTicks::Now() - base::TimeDelta::FromMilliseconds(1),
-      display_refresh_interval);
+      base::TimeTicks::Now() - base::TimeDelta::FromSeconds(1), big_interval);
 
   output_surface.SetMaxFramesPending(2);
-  output_surface.SetAlternateRetroactiveBeginFramePeriod(
-      base::TimeDelta::FromSeconds(-1));
+  output_surface.EnableRetroactiveBeginFrameDeadline(true, true, big_interval);
 
   // We should start off with 0 BeginFrames
   EXPECT_EQ(client.begin_frame_count(), 0);
   EXPECT_EQ(output_surface.pending_swap_buffers(), 0);
 
   // The first SetNeedsBeginFrame(true) should start a retroactive BeginFrame.
+  EXPECT_FALSE(task_runner->HasPendingTask());
   output_surface.SetNeedsBeginFrame(true);
   EXPECT_TRUE(task_runner->HasPendingTask());
   EXPECT_GT(task_runner->NextPendingTaskDelay(), big_interval / 2);
   EXPECT_EQ(client.begin_frame_count(), 1);
 
   output_surface.SetNeedsBeginFrame(false);
   EXPECT_TRUE(task_runner->HasPendingTask());
   EXPECT_EQ(client.begin_frame_count(), 1);
 
   // The second SetNeedBeginFrame(true) should not retroactively start a
@@ skipping 71 matching lines @@
   EXPECT_EQ(1, software_output_device->ensure_backbuffer_count());
   EXPECT_EQ(0, software_output_device->discard_backbuffer_count());
   output_surface.DiscardBackbuffer();
 
   EXPECT_EQ(1, software_output_device->ensure_backbuffer_count());
   EXPECT_EQ(1, software_output_device->discard_backbuffer_count());
 }
 
 }  // namespace
 }  // namespace cc