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

cc/test/layer_tree_test.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/test/layer_tree_test.h"
 
 #include "base/command_line.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/layer_animation_controller.h"
@@ skipping 23 matching lines @@
 bool TestHooks::PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
                                       LayerTreeHostImpl::FrameData* frame_data,
                                       bool result) {
   return true;
 }
 
 bool TestHooks::CanActivatePendingTree(LayerTreeHostImpl* host_impl) {
   return true;
 }
 
+bool TestHooks::CanActivatePendingTreeIfNeeded(LayerTreeHostImpl* host_impl) {
+  return true;
+}
+
 // Adapts LayerTreeHostImpl for test. Runs real code, then invokes test hooks.
 class LayerTreeHostImplForTesting : public LayerTreeHostImpl {
  public:
   static scoped_ptr<LayerTreeHostImplForTesting> Create(
       TestHooks* test_hooks,
       const LayerTreeSettings& settings,
       LayerTreeHostImplClient* host_impl_client,
       Proxy* proxy,
       RenderingStatsInstrumentation* stats_instrumentation) {
     return make_scoped_ptr(
@@ skipping 53 matching lines @@
 
   virtual void OnSwapBuffersComplete(const CompositorFrameAck* ack) OVERRIDE {
     LayerTreeHostImpl::OnSwapBuffersComplete(ack);
     test_hooks_->SwapBuffersCompleteOnThread(this);
   }
 
   virtual void ActivatePendingTreeIfNeeded() OVERRIDE {
     if (!pending_tree())
       return;
 
-    if (!test_hooks_->CanActivatePendingTree(this))
+    if (!test_hooks_->CanActivatePendingTreeIfNeeded(this))
       return;
 
     LayerTreeHostImpl::ActivatePendingTreeIfNeeded();
   }
 
   virtual void ActivatePendingTree() OVERRIDE {
     if (!test_hooks_->CanActivatePendingTree(this))
       return;
 
     test_hooks_->WillActivateTreeOnThread(this);
@@ skipping 493 matching lines @@
 
 scoped_refptr<cc::ContextProvider> LayerTreeTest::
     OffscreenContextProviderForCompositorThread() {
   if (!compositor_thread_contexts_.get() ||
       compositor_thread_contexts_->DestroyedOnMainThread())
     compositor_thread_contexts_ = FakeContextProvider::Create();
   return compositor_thread_contexts_;
 }
 
 }  // namespace cc