Revert 237848 "Use LatencyInfoSwapPromise to track LatencyInfo t..."

trunk/src/cc/trees/layer_tree_host.cc

Index: trunk/src/cc/trees/layer_tree_host.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host.cc	(revision 237855)
+++ trunk/src/cc/trees/layer_tree_host.cc	(working copy)
@@ -382,6 +382,8 @@
                                          min_page_scale_factor_,
                                          max_page_scale_factor_);
   sync_tree->SetPageScaleDelta(page_scale_delta / sent_page_scale_delta);
+  sync_tree->SetLatencyInfo(latency_info_);
+  latency_info_.Clear();
 
   sync_tree->PassSwapPromises(&swap_promise_list_);
 
@@ -703,6 +705,10 @@
   proxy_->SetVisible(visible);
 }
 
+void LayerTreeHost::SetLatencyInfo(const ui::LatencyInfo& latency_info) {
+  latency_info_.MergeWith(latency_info);
+}
+
 void LayerTreeHost::StartPageScaleAnimation(gfx::Vector2d target_offset,
                                             bool use_anchor,
                                             float scale,
@@ -1265,6 +1271,9 @@
 }
 
 void LayerTreeHost::QueueSwapPromise(scoped_ptr<SwapPromise> swap_promise) {
+  if (proxy_->HasImplThread()) {
+    DCHECK(proxy_->CommitRequested() || proxy_->BeginMainFrameRequested());
+  }
   DCHECK(swap_promise);
   if (swap_promise_list_.size() > kMaxQueuedSwapPromiseNumber)
     BreakSwapPromises(SwapPromise::SWAP_PROMISE_LIST_OVERFLOW);