| Index: cc/trees/layer_tree_impl.h
|
| diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
|
| index 2a1e14b148fe19022a757e77dd9db07786b98687..0555e9e099355d0e439f267a90dafd934ff0f8a3 100644
|
| --- a/cc/trees/layer_tree_impl.h
|
| +++ b/cc/trees/layer_tree_impl.h
|
| @@ -49,6 +49,7 @@ class PageScaleAnimation;
|
| class PictureLayerImpl;
|
| class TaskRunnerProvider;
|
| class ResourceProvider;
|
| +class ScrollElasticityHelper;
|
| class TileManager;
|
| class UIResourceRequest;
|
| class VideoFrameControllerClient;
|
| @@ -107,6 +108,8 @@ class CC_EXPORT LayerTreeImpl {
|
| const gfx::Rect ViewportRectForTilePriority() const;
|
| std::unique_ptr<ScrollbarAnimationController>
|
| CreateScrollbarAnimationController(int scroll_layer_id);
|
| + std::unique_ptr<ScrollElasticityHelper> CreateScrollElasticityHelper(
|
| + int scroll_layer_id);
|
| void DidAnimateScrollOffset();
|
| bool use_gpu_rasterization() const;
|
| GpuRasterizationStatus GetGpuRasterizationStatus() const;
|
| @@ -214,7 +217,7 @@ class CC_EXPORT LayerTreeImpl {
|
| void UpdatePropertyTreeScrollingAndAnimationFromMainThread();
|
| void UpdatePropertyTreeScrollOffset(PropertyTrees* property_trees) {
|
| property_trees_.scroll_tree.UpdateScrollOffsetMap(
|
| - &property_trees->scroll_tree.scroll_offset_map(), this);
|
| + &property_trees->scroll_tree, this);
|
| }
|
| void SetPageScaleOnActiveTree(float active_page_scale);
|
| void PushPageScaleFromMainThread(float page_scale_factor,
|
|
|