Index: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp |
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp |
index ec2136e8d9b8766b27666da8dc739c187f96b877..b9b19b90ecfa0635a4f2003df91d54295df0f2ac 100644 |
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp |
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp |
@@ -671,9 +671,12 @@ void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh |
{ |
if (!m_page->mainFrame()->isLocalFrame() || !m_page->deprecatedLocalMainFrame()->view()) |
return; |
- if (WebLayer* scrollLayer = toWebLayer(m_page->deprecatedLocalMainFrame()->view()->layerForScrolling())) { |
+ GraphicsLayer* layer = m_page->deprecatedLocalMainFrame()->view()->layerForScrolling(); |
+ if (WebLayer* scrollLayer = toWebLayer(layer)) { |
m_lastMainThreadScrollingReasons = mainThreadScrollingReasons; |
if (mainThreadScrollingReasons) { |
+ if (ScrollAnimatorBase* scrollAnimator = layer->scrollableArea()->existingScrollAnimator()) |
+ scrollAnimator->takeoverCompositorAnimation(); |
scrollLayer->addMainThreadScrollingReasons(mainThreadScrollingReasons); |
} else { |
// Clear all main thread scrolling reasons except the one that's set |