Index: cc/trees/layer_tree_host_impl.h |
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h |
index 6e860bc805f31c929f49a780b2882d4512721fa3..0533ae42d01a1072da03e06eaf391e22803da9c5 100644 |
--- a/cc/trees/layer_tree_host_impl.h |
+++ b/cc/trees/layer_tree_host_impl.h |
@@ -46,6 +46,7 @@ class EvictionTilePriorityQueue; |
class FrameRateCounter; |
class LayerImpl; |
class LayerTreeImpl; |
+class LayerTreeScrollElasticityClient; |
aelias_OOO_until_Jul13
2014/11/13 02:11:03
obsolete
ccameron
2014/11/13 02:45:57
Done.
|
class MemoryHistory; |
class PageScaleAnimation; |
class PaintTimeCounter; |
@@ -55,6 +56,7 @@ class RasterWorkerPool; |
class RenderPassDrawQuad; |
class RenderingStatsInstrumentation; |
class ResourcePool; |
+class ScrollElasticityHelper; |
class ScrollbarLayerImplBase; |
class TextureMailboxDeleter; |
class TopControlsManager; |
@@ -156,6 +158,7 @@ class CC_EXPORT LayerTreeHostImpl |
bool HaveTouchEventHandlersAt(const gfx::Point& viewport_port) override; |
scoped_ptr<SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( |
ui::LatencyInfo* latency) override; |
+ ScrollElasticityHelper* GetScrollElasticityHelper() override; |
// TopControlsManagerClient implementation. |
void SetControlsTopOffset(float offset) override; |
@@ -626,6 +629,10 @@ class CC_EXPORT LayerTreeHostImpl |
int scroll_layer_id_when_mouse_over_scrollbar_; |
ScopedPtrVector<SwapPromise> swap_promises_for_main_thread_scroll_update_; |
+ // An object to implement the ScrollElasticityHelper interface and |
+ // hold all state related to elasticity. May be NULL if never requested. |
+ scoped_ptr<ScrollElasticityHelper> scroll_elasticity_helper_; |
+ |
bool tile_priorities_dirty_; |
// The optional delegate for the root layer scroll offset. |