Revert 237857 "Revert 237848 "Use LatencyInfoSwapPromise to trac..."

trunk/src/cc/trees/layer_tree_host.h

 // 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.
 
 #ifndef CC_TREES_LAYER_TREE_HOST_H_
 #define CC_TREES_LAYER_TREE_HOST_H_
 
 #include <limits>
 #include <list>
 #include <string>
@@ skipping 19 matching lines @@
 #include "cc/layers/layer_lists.h"
 #include "cc/output/output_surface.h"
 #include "cc/resources/resource_format.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_settings.h"
 #include "cc/trees/occlusion_tracker.h"
 #include "cc/trees/proxy.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/events/latency_info.h"
 #include "ui/gfx/rect.h"
 
 namespace cc {
 
 class AnimationRegistrar;
 class HeadsUpDisplayLayer;
 class Layer;
 class LayerTreeHostImpl;
 class LayerTreeHostImplClient;
 class LayerTreeHostSingleThreadClient;
@@ skipping 175 matching lines @@
   bool visible() const { return visible_; }
 
   void StartPageScaleAnimation(gfx::Vector2d target_offset,
                                bool use_anchor,
                                float scale,
                                base::TimeDelta duration);
 
   void ApplyScrollAndScale(const ScrollAndScaleSet& info);
 
   void SetImplTransform(const gfx::Transform& transform);
-  void SetLatencyInfo(const ui::LatencyInfo& latency_info);
 
   // Virtual for tests.
   virtual void StartRateLimiter();
   virtual void StopRateLimiter();
 
   void RateLimit();
 
   bool AlwaysUsePartialTextureUpdates();
   size_t MaxPartialTextureUpdates() const;
   bool RequestPartialTextureUpdate();
@@ skipping 161 matching lines @@
   struct PendingPageScaleAnimation {
     gfx::Vector2d target_offset;
     bool use_anchor;
     float scale;
     base::TimeDelta duration;
   };
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
   bool in_paint_layer_contents_;
 
-  ui::LatencyInfo latency_info_;
-
   static const int kTotalFramesToUseForLCDTextMetrics = 50;
   int total_frames_used_for_lcd_text_metrics_;
 
   struct LCDTextMetrics {
     LCDTextMetrics()
         : total_num_cc_layers(0),
           total_num_cc_layers_can_use_lcd_text(0),
           total_num_cc_layers_will_use_lcd_text(0) {}
 
     int64 total_num_cc_layers;
@@ skipping 11 matching lines @@
   SharedBitmapManager* shared_bitmap_manager_;
 
   ScopedPtrVector<SwapPromise> swap_promise_list_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_LAYER_TREE_HOST_H_