| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index d6bb16b88c45c1f449a5bcacf75fc2a03ac5043c..bfad6b911cad12e8f3a4c19a201e30b4c943acbb 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -18,7 +18,6 @@
|
| #include "cc/animation/animation_events.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/base/scoped_ptr_vector.h"
|
| -#include "cc/debug/latency_info.h"
|
| #include "cc/layers/layer_lists.h"
|
| #include "cc/output/output_surface.h"
|
| #include "cc/scheduler/rate_limiter.h"
|
| @@ -31,6 +30,7 @@
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbar.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "third_party/skia/include/core/SkPicture.h"
|
| +#include "ui/base/latency_info.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| #if defined(COMPILER_GCC)
|
| @@ -216,7 +216,7 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
| void ApplyScrollAndScale(const ScrollAndScaleSet& info);
|
|
|
| void SetImplTransform(const gfx::Transform& transform);
|
| - void SetLatencyInfo(const LatencyInfo& latency_info);
|
| + void SetLatencyInfo(const ui::LatencyInfo& latency_info);
|
|
|
| void StartRateLimiter(WebKit::WebGraphicsContext3D* context3d);
|
| void StopRateLimiter(WebKit::WebGraphicsContext3D* context3d);
|
| @@ -343,7 +343,7 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
|
|
| bool in_paint_layer_contents_;
|
|
|
| - LatencyInfo latency_info_;
|
| + ui::LatencyInfo latency_info_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
|
| };
|
|
|