cc: Disable LastInputEventForBeginFrame

The LastInputEventForBeginFrame optimization makes reasoning
about ordering and scheduling more difficult.

Disabling it for now.

BUG=245438

Review URL: https://chromiumcodereview.appspot.com/15651006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204383 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 0 insertions, 66 deletions

diff --git a/cc/input/input_handler.h b/cc/input/input_handler.h
index 57bd7e4..e4499af 100644
--- a/cc/input/input_handler.h
+++ b/cc/input/input_handler.h
@@ -118,9 +118,6 @@ class CC_EXPORT InputHandler {
 
   virtual bool HaveTouchEventHandlersAt(gfx::Point viewport_point) = 0;
 
-  virtual void DidReceiveLastInputEventForBeginFrame(
-      base::TimeTicks frame_time) = 0;
-
  protected:
   InputHandler() {}
   virtual ~InputHandler() {}
diff --git a/cc/test/fake_layer_tree_host_impl_client.h b/cc/test/fake_layer_tree_host_impl_client.h
index 7a16830..44e5380 100644
--- a/cc/test/fake_layer_tree_host_impl_client.h
+++ b/cc/test/fake_layer_tree_host_impl_client.h
@@ -38,8 +38,6 @@ class FakeLayerTreeHostImplClient : public LayerTreeHostImplClient {
   virtual void RenewTreePriority() OVERRIDE {}
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta)
       OVERRIDE {}
-  virtual void DidReceiveLastInputEventForBeginFrameOnImplThread(
-      base::TimeTicks frame_time) OVERRIDE {}
   virtual void DidActivatePendingTree() OVERRIDE {}
 };
 
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index d89460a..7d8bf91 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -378,11 +378,6 @@ bool LayerTreeHostImpl::HaveTouchEventHandlersAt(gfx::Point viewport_point) {
   return false;
 }
 
-void LayerTreeHostImpl::DidReceiveLastInputEventForBeginFrame(
-    base::TimeTicks frame_time) {
-  client_->DidReceiveLastInputEventForBeginFrameOnImplThread(frame_time);
-}
-
 void LayerTreeHostImpl::TrackDamageForAllSurfaces(
     LayerImpl* root_draw_layer,
     const LayerImplList& render_surface_layer_list) {
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index f785b97..f65922a 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -74,8 +74,6 @@ class LayerTreeHostImplClient {
   virtual bool IsInsideDraw() = 0;
   virtual void RenewTreePriority() = 0;
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay) = 0;
-  virtual void DidReceiveLastInputEventForBeginFrameOnImplThread(
-      base::TimeTicks frame_time) = 0;
   virtual void DidActivatePendingTree() = 0;
 
  protected:
@@ -125,8 +123,6 @@ class CC_EXPORT LayerTreeHostImpl
                                        base::TimeDelta duration) OVERRIDE;
   virtual void ScheduleAnimation() OVERRIDE;
   virtual bool HaveTouchEventHandlersAt(gfx::Point viewport_port) OVERRIDE;
-  virtual void DidReceiveLastInputEventForBeginFrame(
-      base::TimeTicks frame_time) OVERRIDE;
 
   // TopControlsManagerClient implementation.
   virtual void DidChangeTopControlsPosition() OVERRIDE;
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index b2cc816..ab97c86 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -128,8 +128,6 @@ class LayerTreeHostImplTest : public testing::Test,
   virtual void RenewTreePriority() OVERRIDE {}
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay)
       OVERRIDE {}
-  virtual void DidReceiveLastInputEventForBeginFrameOnImplThread(
-      base::TimeTicks frame_time) OVERRIDE {}
   virtual void DidActivatePendingTree() OVERRIDE {}
 
   void set_reduce_memory_result(bool reduce_memory_result) {
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 65b8e24..89faf49 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -2317,43 +2317,6 @@ class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled);
 
-class LayerTreeHostTestInputDrivenRendering : public LayerTreeHostTest {
- public:
-  virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
-    settings->begin_frame_scheduling_enabled = true;
-  }
-
-  virtual void BeginTest() OVERRIDE {
-    frame_time_ = base::TimeTicks::Now();
-    PostSetNeedsCommitToMainThread();
-  }
-
-  virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
-    // Post a task to send the final input event for the current BeginFrame;
-    // it should trigger rendering.
-    ImplThread()->PostTask(
-        base::Bind(&LayerTreeHostTestInputDrivenRendering::SendFinalInputEvent,
-                   base::Unretained(this),
-                   base::Unretained(host_impl)));
-  }
-
-  void SendFinalInputEvent(LayerTreeHostImpl* host_impl) {
-    host_impl->DidReceiveLastInputEventForBeginFrame(frame_time_);
-  }
-
-  virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
-    EXPECT_EQ(frame_time_, **host_impl->fps_counter()->begin());
-    EndTest();
-  }
-
-  virtual void AfterTest() OVERRIDE {}
-
- private:
-  base::TimeTicks frame_time_;
-};
-
-MULTI_THREAD_TEST_F(LayerTreeHostTestInputDrivenRendering);
-
 class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation
     : public LayerTreeHostTest {
  protected:
diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
index 525f609..4d98b5b 100644
--- a/cc/trees/single_thread_proxy.h
+++ b/cc/trees/single_thread_proxy.h
@@ -71,8 +71,6 @@ class SingleThreadProxy : public Proxy, LayerTreeHostImplClient {
   virtual void RenewTreePriority() OVERRIDE {}
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay)
       OVERRIDE {}
-  virtual void DidReceiveLastInputEventForBeginFrameOnImplThread(
-      base::TimeTicks frame_time) OVERRIDE {}
   virtual void DidActivatePendingTree() OVERRIDE {}
 
   // Called by the legacy path where RenderWidget does the scheduling.
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index f61e7fe..4fcb8ac 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -1369,15 +1369,6 @@ void ThreadProxy::StartScrollbarAnimationOnImplThread() {
       layer_tree_host_impl_->CurrentFrameTimeTicks());
 }
 
-void ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread(
-    base::TimeTicks frame_time) {
-  if (begin_frame_scheduling_enabled_) {
-    TRACE_EVENT0("cc",
-        "ThreadProxy::DidReceiveLastInputEventForBeginFrameOnImplThread");
-    BeginFrameOnImplThread(frame_time);
-  }
-}
-
 void ThreadProxy::DidActivatePendingTree() {
   DCHECK(IsImplThread());
   TRACE_EVENT0("cc", "ThreadProxy::DidActivatePendingTreeOnImplThread");
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
index ebd228b..eff23db 100644
--- a/cc/trees/thread_proxy.h
+++ b/cc/trees/thread_proxy.h
@@ -86,8 +86,6 @@ class ThreadProxy : public Proxy,
   virtual void RenewTreePriority() OVERRIDE;
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay)
       OVERRIDE;
-  virtual void DidReceiveLastInputEventForBeginFrameOnImplThread(
-      base::TimeTicks frame_time) OVERRIDE;
   virtual void DidActivatePendingTree() OVERRIDE;
 
   // SchedulerClient implementation