Re-land: cc: Add raster finished signals to RasterWorkerPool.

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 732 matching lines @@
       EXPECT_NE(first_frame_time_, impl->CurrentFrameTimeTicks());
       EndTest();
       return;
     }
 
     EXPECT_FALSE(impl->settings().impl_side_painting);
     EndTest();
   }
 
   virtual bool CanActivatePendingTree(LayerTreeHostImpl* impl) OVERRIDE {
+    if (frame_ >= 1)
+      return true;
+
+    return false;
+  }
+
+  virtual bool CanActivatePendingTreeIfNeeded(LayerTreeHostImpl* impl)
+      OVERRIDE {
     frame_++;
     if (frame_ == 1) {
       first_frame_time_ = impl->CurrentFrameTimeTicks();
 
       // Since base::TimeTicks::Now() uses a low-resolution clock on
       // Windows, we need to make sure that the clock has incremented past
       // first_frame_time_.
       while (first_frame_time_ == base::TimeTicks::Now()) {}
 
       return false;
@@ skipping 2128 matching lines @@
   }
 
   virtual void SetupTree() OVERRIDE {
     layer_ = FakePictureLayer::Create(&client_);
     layer_tree_host()->SetRootLayer(layer_);
     LayerTreeHostTest::SetupTree();
   }
 
   virtual void BeginTest() OVERRIDE {
     initialized_gl_ = false;
+    num_draws_ = 0;
     PostSetNeedsCommitToMainThread();
   }
 
   virtual scoped_ptr<OutputSurface> CreateOutputSurface() OVERRIDE {
     scoped_ptr<TestWebGraphicsContext3D> context3d(
         TestWebGraphicsContext3D::Create());
     context3d->set_support_swapbuffers_complete_callback(false);
 
     return FakeOutputSurface::CreateDeferredGL(
         scoped_ptr<SoftwareOutputDevice>(new SoftwareOutputDevice))
         .PassAs<OutputSurface>();
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     ASSERT_TRUE(host_impl->RootLayer());
     FakePictureLayerImpl* layer_impl =
         static_cast<FakePictureLayerImpl*>(host_impl->RootLayer());
     if (!initialized_gl_) {
       EXPECT_EQ(1u, layer_impl->append_quads_count());
       ImplThreadTaskRunner()->PostTask(FROM_HERE, base::Bind(
           &LayerTreeHostTestDeferredInitialize::DeferredInitializeAndRedraw,
           base::Unretained(this),
           base::Unretained(host_impl)));
     } else {
-      EXPECT_EQ(2u, layer_impl->append_quads_count());
-      EndTest();
+      if (!num_draws_) {
+        EXPECT_EQ(2u, layer_impl->append_quads_count());
+        EndTest();
+      }
+      num_draws_++;
     }
   }
 
   void DeferredInitializeAndRedraw(LayerTreeHostImpl* host_impl) {
     EXPECT_TRUE(static_cast<FakeOutputSurface*>(host_impl->output_surface())
                     ->SetAndInitializeContext3D(
                           scoped_ptr<WebKit::WebGraphicsContext3D>(
                               TestWebGraphicsContext3D::Create())));
     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_;
+  int num_draws_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestDeferredInitialize);
 
 }  // namespace
 }  // namespace cc