cc: Make scheduling be driven by vsync for android webview.

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 43 matching lines @@
       tile_task_worker_pool, resource_pool, staging_resource_pool);
 }
 
 class ExternalBeginFrameSourceForTest
     : public BeginFrameSourceMixIn,
       public NON_EXPORTED_BASE(base::NonThreadSafe) {
  public:
   explicit ExternalBeginFrameSourceForTest(double refresh_rate)
       : milliseconds_per_frame_(1000.0 / refresh_rate),
         is_ready_(false),
+        needs_begin_frames_(false),
         weak_ptr_factory_(this) {
+    test_on_begin_frame_closure_ = base::Bind(
+        &ExternalBeginFrameSourceForTest::TestOnBeginFrame,
+        weak_ptr_factory_.GetWeakPtr());
     DetachFromThread();
   }
 
   virtual ~ExternalBeginFrameSourceForTest() {
     DCHECK(CalledOnValidThread());
   }
 
   void OnNeedsBeginFramesChange(bool needs_begin_frames) override {
     DCHECK(CalledOnValidThread());
-    if (needs_begin_frames) {
-      base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE,
-        base::Bind(&ExternalBeginFrameSourceForTest::TestOnBeginFrame,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::TimeDelta::FromMilliseconds(milliseconds_per_frame_));
-    }
+    if (needs_begin_frames_ == needs_begin_frames)
+      return;
+    needs_begin_frames_ = needs_begin_frames;
+    ScheduleBeginFrameIfNeeded();
   }
 
   void SetClientReady() override {
     DCHECK(CalledOnValidThread());
     is_ready_ = true;
   }
 
   bool is_ready() const {
     return is_ready_;
   }
 
   void TestOnBeginFrame() {
     DCHECK(CalledOnValidThread());
     CallOnBeginFrame(CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE));
+    ScheduleBeginFrameIfNeeded();
+  }
+
+  void ScheduleBeginFrameIfNeeded() {
+    test_on_begin_frame_task_.Cancel();
+    test_on_begin_frame_task_.Reset(test_on_begin_frame_closure_);
+    if (needs_begin_frames_)
+      base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
+          test_on_begin_frame_task_.callback(), 
+          base::TimeDelta::FromMilliseconds(milliseconds_per_frame_));
   }
 
  private:
   double milliseconds_per_frame_;
   bool is_ready_;
+  bool needs_begin_frames_;
+  base::Closure test_on_begin_frame_closure_;
+  base::CancelableClosure test_on_begin_frame_task_;
   base::WeakPtrFactory<ExternalBeginFrameSourceForTest> weak_ptr_factory_;
 };
 
 // Adapts ThreadProxy for test. Injects test hooks for testing.
 class ThreadProxyForTest : public ThreadProxy {
  public:
   static scoped_ptr<Proxy> Create(
       TestHooks* test_hooks,
       LayerTreeHost* host,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
@@ skipping 41 matching lines @@
   void ScheduledActionBeginOutputSurfaceCreation() override {
     ThreadProxy::ScheduledActionBeginOutputSurfaceCreation();
     test_hooks_->ScheduledActionBeginOutputSurfaceCreation();
   }
 
   void ScheduledActionPrepareTiles() override {
     ThreadProxy::ScheduledActionPrepareTiles();
     test_hooks_->ScheduledActionPrepareTiles();
   }
 
+  void ScheduledActionInvalidateOutputSurface() override {
+    ThreadProxy::ScheduledActionInvalidateOutputSurface();
+    test_hooks_->ScheduledActionInvalidateOutputSurface();
+  }
+
   ThreadProxyForTest(
       TestHooks* test_hooks,
       LayerTreeHost* host,
       scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
       scoped_ptr<BeginFrameSource> external_begin_frame_source)
       : ThreadProxy(host, main_task_runner,
                     impl_task_runner,
                     external_begin_frame_source.Pass()),
         test_hooks_(test_hooks) {}
@@ skipping 658 matching lines @@
   return -1;
 }
 
 void LayerTreeTest::DestroyLayerTreeHost() {
   if (layer_tree_host_ && layer_tree_host_->root_layer())
     layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
   layer_tree_host_ = nullptr;
 }
 
 }  // namespace cc