| 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 5dd7f0b41bd45d803bd7ed3705fb1e3889c41492..418519be67bfc6c0d637437f112d1cfa42489ee1 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -190,7 +190,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| float page_scale,
|
| base::TimeDelta duration);
|
| void SetNeedsAnimateInput() override;
|
| - bool IsCurrentlyScrollingInnerViewport() const override;
|
| + bool IsCurrentlyScrollingViewport() const override;
|
| bool IsCurrentlyScrollingLayerAt(
|
| const gfx::Point& viewport_point,
|
| InputHandler::ScrollInputType type) const override;
|
| @@ -650,14 +650,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| bool UpdateGpuRasterizationStatus();
|
| void UpdateTreeResourcesForGpuRasterizationIfNeeded();
|
|
|
| - Viewport* viewport() { return viewport_.get(); }
|
| -
|
| - // Scroll by preferring to move the outer viewport first, only moving the
|
| - // inner if the outer is at its scroll extents.
|
| - void ScrollViewportBy(gfx::Vector2dF scroll_delta);
|
| - // Scroll by preferring to move the inner viewport first, only moving the
|
| - // outer if the inner is at its scroll extents.
|
| - void ScrollViewportInnerFirst(gfx::Vector2dF scroll_delta);
|
| + Viewport* viewport() const { return viewport_.get(); }
|
|
|
| InputHandler::ScrollStatus ScrollBeginImpl(
|
| ScrollState* scroll_state,
|
|
|