| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| index 56503d84012376488405d0cb8e4819c1408d3c84..562380a63cb6511ae7f5e79a4eaaa841a5264e49 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp
|
| @@ -1109,14 +1109,10 @@ void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea,
|
|
|
| void GraphicsLayer::didScroll() {
|
| if (m_scrollableArea) {
|
| - DoublePoint newPosition =
|
| - -m_scrollableArea->scrollOrigin() +
|
| - toDoubleSize(m_layer->layer()->scrollPositionDouble());
|
| -
|
| - // FrameView::setScrollPosition doesn't work for compositor commits (interacts poorly with programmatic scroll animations)
|
| - // so we need to use the ScrollableArea version. The FrameView method should go away soon anyway.
|
| - m_scrollableArea->ScrollableArea::setScrollPosition(newPosition,
|
| - CompositorScroll);
|
| + ScrollOffset newOffset = toScrollOffset(-m_scrollableArea->scrollOrigin()) +
|
| + m_layer->layer()->scrollOffset();
|
| +
|
| + m_scrollableArea->setScrollOffset(newOffset, CompositorScroll);
|
| }
|
| }
|
|
|
|
|