Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: Source/WebCore/rendering/RenderLayerCompositor.cpp

Issue 11880030: Merge 139024 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLayerCompositor.cpp
===================================================================
--- Source/WebCore/rendering/RenderLayerCompositor.cpp (revision 139631)
+++ Source/WebCore/rendering/RenderLayerCompositor.cpp (working copy)
@@ -1169,6 +1169,9 @@
if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
if (scrollingCoordinator->coordinatesScrollingForFrameView(frameView))
return;
+ if (Settings* settings = m_renderView->document()->settings())
+ if (settings->compositedScrollingForFramesEnabled())
+ scrollingCoordinator->scrollableAreaScrollLayerDidChange(frameView, m_scrollLayer.get());
}
m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
« no previous file with comments | « Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698