Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

trunk/src/cc/trees/layer_tree_host_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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/synchronization/lock.h"
 #include "cc/animation/timing_function.h"
@@ skipping 2031 matching lines @@
 
  private:
   gfx::Size bounds_;
   FillRectContentLayerClient content_client_;
   scoped_refptr<PictureLayer> layer_;
   skia::RefPtr<SkPicture> picture_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestCapturePicture);
 
+class LayerTreeHostTestMaxPendingFrames : public LayerTreeHostTest {
+ public:
+  LayerTreeHostTestMaxPendingFrames() : LayerTreeHostTest() {}
+
+  virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
+
+  virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+    DCHECK(host_impl->proxy()->HasImplThread());
+
+    const ThreadProxy* proxy = static_cast<ThreadProxy*>(host_impl->proxy());
+    if (delegating_renderer()) {
+      EXPECT_EQ(1, proxy->MaxFramesPendingForTesting());
+    } else {
+      EXPECT_EQ(FrameRateController::DEFAULT_MAX_FRAMES_PENDING,
+                proxy->MaxFramesPendingForTesting());
+    }
+    EndTest();
+  }
+
+  virtual void AfterTest() OVERRIDE {}
+};
+
+TEST_F(LayerTreeHostTestMaxPendingFrames, DelegatingRenderer) {
+  RunTest(true, true, true);
+}
+
+TEST_F(LayerTreeHostTestMaxPendingFrames, GLRenderer) {
+  RunTest(true, false, true);
+}
+
 class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted
     : public LayerTreeHostTest {
  public:
   LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted()
       : root_layer_(FakeContentLayer::Create(&client_)),
         child_layer1_(FakeContentLayer::Create(&client_)),
         child_layer2_(FakeContentLayer::Create(&client_)),
         num_commits_(0) {}
 
   virtual void BeginTest() OVERRIDE {
@@ skipping 154 matching lines @@
 SINGLE_THREAD_TEST_F(LayerTreeHostTestLCDNotification);
 
 // Verify that the BeginFrame notification is used to initiate rendering.
 class LayerTreeHostTestBeginFrameNotification : public LayerTreeHostTest {
  public:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->begin_frame_scheduling_enabled = true;
   }
 
   virtual void BeginTest() OVERRIDE {
-    // This will trigger a SetNeedsBeginFrame which will trigger a BeginFrame.
     PostSetNeedsCommitToMainThread();
   }
 
+  virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+    FakeOutputSurface* fake_output_surface =
+        reinterpret_cast<FakeOutputSurface*>(host_impl->output_surface());
+
+    // The BeginFrame notification is turned off now but will get
+    // enabled once we return, so post a task to trigger it.
+    ASSERT_FALSE(fake_output_surface->needs_begin_frame());
+    PostBeginFrameOnImplThread(fake_output_surface);
+  }
+
+  void PostBeginFrameOnImplThread(FakeOutputSurface* fake_output_surface) {
+    DCHECK(ImplThread());
+    ImplThread()->PostTask(
+        base::Bind(&LayerTreeHostTestBeginFrameNotification::BeginFrame,
+                   base::Unretained(this),
+                   base::Unretained(fake_output_surface)));
+  }
+
+  void BeginFrame(FakeOutputSurface* fake_output_surface) {
+    ASSERT_TRUE(fake_output_surface->needs_begin_frame());
+    fake_output_surface->BeginFrame(frame_time_);
+  }
+
   virtual bool PrepareToDrawOnThread(
       LayerTreeHostImpl* host_impl,
       LayerTreeHostImpl::FrameData* frame,
       bool result) OVERRIDE {
     EndTest();
     return true;
   }
 
   virtual void AfterTest() OVERRIDE {}
 
@@ skipping 525 matching lines @@
         layer_tree_host()->CompositeAndReadback(pixels, gfx::Rect(0, 0, 1, 1));
         break;
       case 3:
         // Round 5 done.
         EXPECT_EQ(5, commit);
         EndTest();
         break;
     }
   }
 
+  virtual void SwapBuffersCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
+    const ThreadProxy* proxy = static_cast<ThreadProxy*>(impl->proxy());
+    EXPECT_EQ(0, proxy->NumFramesPendingForTesting());
+  }
+
   virtual void AfterTest() OVERRIDE {}
 
  protected:
   int frame_;
 };
 
 TEST_F(LayerTreeHostTestNumFramesPending, DelegatingRenderer) {
   RunTest(true, true, true);
 }
 
@@ skipping 46 matching lines @@
     }
   }
 
   void DeferredInitializeAndRedraw(LayerTreeHostImpl* host_impl) {
     EXPECT_TRUE(
         host_impl->DeferredInitialize(scoped_refptr<ContextProvider>()));
     initialized_gl_ = true;
 
     // Force redraw again.
     host_impl->SetNeedsRedrawRect(gfx::Rect(1, 1));
-
-    // If we didn't swap this begin frame, we need to request another one.
-    host_impl->SetNeedsBeginFrame(true);
   }
 
   virtual void AfterTest() OVERRIDE {
     EXPECT_TRUE(initialized_gl_);
   }
 
  private:
   FakeContentLayerClient client_;
   scoped_refptr<FakePictureLayer> layer_;
   bool initialized_gl_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestDeferredInitialize);
 
 }  // namespace
 }  // namespace cc