| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| index cdcd67ae22fcd6bc9ab4c1ce8fbe4604f50359b2..98bca4b9307bfad1e983291c2d86f6a8b9a5472a 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| @@ -237,15 +237,14 @@ ScrollAnimatorCompositorCoordinator::compositorPlayer() const {
|
| }
|
|
|
| FloatPoint ScrollAnimatorCompositorCoordinator::compositorOffsetFromBlinkOffset(
|
| - FloatPoint offset) {
|
| - offset.moveBy(getScrollableArea()->scrollOrigin());
|
| - return offset;
|
| + ScrollOffset offset) {
|
| + return getScrollableArea()->scrollOrigin() + offset;
|
| }
|
|
|
| -FloatPoint ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(
|
| +ScrollOffset
|
| +ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(
|
| FloatPoint offset) {
|
| - offset.moveBy(-getScrollableArea()->scrollOrigin());
|
| - return offset;
|
| + return offset - getScrollableArea()->scrollOrigin();
|
| }
|
|
|
| bool ScrollAnimatorCompositorCoordinator::hasImplOnlyAnimationUpdate() const {
|
| @@ -281,17 +280,17 @@ void ScrollAnimatorCompositorCoordinator::updateCompositorAnimations() {
|
| updateImplOnlyCompositorAnimations();
|
| }
|
|
|
| -void ScrollAnimatorCompositorCoordinator::scrollPositionChanged(
|
| - const DoublePoint& offset,
|
| +void ScrollAnimatorCompositorCoordinator::scrollOffsetChanged(
|
| + const ScrollOffset& offset,
|
| ScrollType scrollType) {
|
| - getScrollableArea()->scrollPositionChanged(offset, scrollType);
|
| + getScrollableArea()->scrollOffsetChanged(offset, scrollType);
|
| }
|
|
|
| -void ScrollAnimatorCompositorCoordinator::adjustAnimationAndSetScrollPosition(
|
| - const DoublePoint& position,
|
| +void ScrollAnimatorCompositorCoordinator::adjustAnimationAndSetScrollOffset(
|
| + const ScrollOffset& offset,
|
| ScrollType scrollType) {
|
| // Subclasses should override this and adjust the animation as necessary.
|
| - scrollPositionChanged(position, scrollType);
|
| + scrollOffsetChanged(offset, scrollType);
|
| }
|
|
|
| void ScrollAnimatorCompositorCoordinator::adjustImplOnlyScrollOffsetAnimation(
|
|
|