| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index b205143f06b227cc36e8f1b23a648781bcea4630..d1cf0530586d65e6566df624062c474671ff5626 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -108,7 +108,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| void OnTransformAnimated(const gfx::Transform& transform) override;
|
| void OnScrollOffsetAnimated(const gfx::ScrollOffset& scroll_offset) override;
|
| void OnAnimationWaitingForDeletion() override;
|
| - void OnScrollOffsetAnimationRemoved() override;
|
| bool IsActive() const override;
|
|
|
| // AnimationDelegate implementation.
|
| @@ -405,8 +404,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| void SetSentScrollDelta(const gfx::Vector2dF& sent_scroll_delta);
|
| gfx::Vector2dF sent_scroll_delta() const { return sent_scroll_delta_; }
|
|
|
| - void ClearScrollDeltaAtActivation();
|
| -
|
| // Returns the delta of the scroll that was outside of the bounds of the
|
| // initial scroll
|
| gfx::Vector2dF ScrollBy(const gfx::Vector2dF& scroll);
|
| @@ -649,7 +646,6 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| bool draw_checkerboard_for_missing_tiles_ : 1;
|
| bool draws_content_ : 1;
|
| bool hide_layer_and_subtree_ : 1;
|
| - bool clear_scroll_delta_at_activation_ : 1;
|
|
|
| // Cache transform_'s invertibility.
|
| bool transform_is_invertible_ : 1;
|
|
|