Revert "Implement scroll handler latency tracking"

This reverts commit 93a9886b01066905b785f8e87827327250fba54b.

This CL makes mean_input_event_latency crazy.

BUG=394889
TBR=skyostil
NOTRY=true

Review URL: https://codereview.chromium.org/400533006

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

6 files changed, 8 insertions, 36 deletions

diff --git a/cc/base/latency_info_swap_promise.cc b/cc/base/latency_info_swap_promise.cc
index 380337f..cc2f1c1 100644
--- a/cc/base/latency_info_swap_promise.cc
+++ b/cc/base/latency_info_swap_promise.cc
@@ -45,8 +45,4 @@ void LatencyInfoSwapPromise::DidNotSwap(DidNotSwapReason reason) {
   // DCHECK(latency_.terminated);
 }
 
-int64 LatencyInfoSwapPromise::TraceId() const {
-  return latency_.trace_id;
-}
-
 }  // namespace cc
diff --git a/cc/base/latency_info_swap_promise.h b/cc/base/latency_info_swap_promise.h
index a210a3f..1a2b1d6 100644
--- a/cc/base/latency_info_swap_promise.h
+++ b/cc/base/latency_info_swap_promise.h
@@ -19,8 +19,6 @@ class CC_EXPORT LatencyInfoSwapPromise : public SwapPromise {
   virtual void DidSwap(CompositorFrameMetadata* metadata) OVERRIDE;
   virtual void DidNotSwap(DidNotSwapReason reason) OVERRIDE;
 
-  virtual int64 TraceId() const OVERRIDE;
-
  private:
   ui::LatencyInfo latency_;
 };
diff --git a/cc/base/latency_info_swap_promise_monitor.cc b/cc/base/latency_info_swap_promise_monitor.cc
index 1a69b21..0f2ff74 100644
--- a/cc/base/latency_info_swap_promise_monitor.cc
+++ b/cc/base/latency_info_swap_promise_monitor.cc
@@ -9,19 +9,6 @@
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 
-namespace {
-
-bool AddRenderingScheduledComponent(ui::LatencyInfo* latency_info) {
-  if (latency_info->FindLatency(
-          ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, 0))
-    return false;
-  latency_info->AddLatencyNumber(
-      ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, 0);
-  return true;
-}
-
-}  // namespace
-
 namespace cc {
 
 LatencyInfoSwapPromiseMonitor::LatencyInfoSwapPromiseMonitor(
@@ -34,25 +21,23 @@ LatencyInfoSwapPromiseMonitor::LatencyInfoSwapPromiseMonitor(
 LatencyInfoSwapPromiseMonitor::~LatencyInfoSwapPromiseMonitor() {}
 
 void LatencyInfoSwapPromiseMonitor::OnSetNeedsCommitOnMain() {
-  if (AddRenderingScheduledComponent(latency_)) {
+  if (!latency_->FindLatency(
+          ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, 0)) {
+    latency_->AddLatencyNumber(
+        ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, 0);
     scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_));
     layer_tree_host_->QueueSwapPromise(swap_promise.Pass());
   }
 }
 
 void LatencyInfoSwapPromiseMonitor::OnSetNeedsRedrawOnImpl() {
-  if (AddRenderingScheduledComponent(latency_)) {
+  if (!latency_->FindLatency(
+          ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, 0)) {
+    latency_->AddLatencyNumber(
+        ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_COMPONENT, 0, 0);
     scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_));
     layer_tree_host_impl_->active_tree()->QueueSwapPromise(swap_promise.Pass());
   }
 }
 
-void LatencyInfoSwapPromiseMonitor::OnForwardScrollUpdateToMainThreadOnImpl() {
-  if (AddRenderingScheduledComponent(latency_)) {
-    scoped_ptr<SwapPromise> swap_promise(new LatencyInfoSwapPromise(*latency_));
-    layer_tree_host_impl_->QueueSwapPromiseForMainThreadScrollUpdate(
-        swap_promise.Pass());
-  }
-}
-
 }  // namespace cc
diff --git a/cc/base/latency_info_swap_promise_monitor.h b/cc/base/latency_info_swap_promise_monitor.h
index 1a114fb..a463fdb 100644
--- a/cc/base/latency_info_swap_promise_monitor.h
+++ b/cc/base/latency_info_swap_promise_monitor.h
@@ -26,7 +26,6 @@ class CC_EXPORT LatencyInfoSwapPromiseMonitor : public SwapPromiseMonitor {
 
   virtual void OnSetNeedsCommitOnMain() OVERRIDE;
   virtual void OnSetNeedsRedrawOnImpl() OVERRIDE;
-  virtual void OnForwardScrollUpdateToMainThreadOnImpl() OVERRIDE;
 
  private:
   ui::LatencyInfo* latency_;
diff --git a/cc/base/swap_promise.h b/cc/base/swap_promise.h
index 1ef44c9..36a5b13 100644
--- a/cc/base/swap_promise.h
+++ b/cc/base/swap_promise.h
@@ -43,11 +43,6 @@ class CC_EXPORT SwapPromise {
 
   virtual void DidSwap(CompositorFrameMetadata* metadata) = 0;
   virtual void DidNotSwap(DidNotSwapReason reason) = 0;
-
-  // A non-zero trace id identifies a trace flow object that is embedded in the
-  // swap promise. This can be used for registering additional flow steps to
-  // visualize the object's path through the system.
-  virtual int64 TraceId() const = 0;
 };
 
 }  // namespace cc
diff --git a/cc/base/swap_promise_monitor.h b/cc/base/swap_promise_monitor.h
index b8c8cd0..21a159a 100644
--- a/cc/base/swap_promise_monitor.h
+++ b/cc/base/swap_promise_monitor.h
@@ -33,7 +33,6 @@ class CC_EXPORT SwapPromiseMonitor {
 
   virtual void OnSetNeedsCommitOnMain() = 0;
   virtual void OnSetNeedsRedrawOnImpl() = 0;
-  virtual void OnForwardScrollUpdateToMainThreadOnImpl() = 0;
 
  protected:
   LayerTreeHost* layer_tree_host_;