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 00bc234084636803e37c5bb5c78fd852dc77e77b..57d4d49aeb14e589d9969e066963ef5e06990dfd 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp |
@@ -1178,14 +1178,12 @@ void GraphicsLayer::setScrollableArea(ScrollableArea* scrollableArea, |
void GraphicsLayer::didScroll() { |
if (m_scrollableArea) { |
- DoublePoint newPosition = |
- -m_scrollableArea->scrollOrigin() + |
- toDoubleSize(m_layer->layer()->scrollPositionDouble()); |
+ ScrollOffset newOffset = toScrollOffset(-m_scrollableArea->scrollOrigin()) + |
+ m_layer->layer()->scrollOffset(); |
// 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. |
bokan
2016/10/02 19:47:51
Remove comment
szager1
2016/10/05 07:43:36
Done.
|
- m_scrollableArea->ScrollableArea::setScrollPosition(newPosition, |
- CompositorScroll); |
+ m_scrollableArea->setScrollOffset(newOffset, CompositorScroll); |
} |
} |