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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1308273010: Adapt and reland old position sticky implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge with master (removing horizontal-bt test) Created 5 years 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
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 143a285cec09eff55cdb35f7bca6233e0eb36fbd..4d38918be209225f784b542ad52e48c5508a8bee 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1557,7 +1557,7 @@ void FrameView::didScrollTimerFired(Timer<FrameView>*)
m_frame->document()->fetcher()->updateAllImageResourcePriorities();
}
-void FrameView::updateLayersAndCompositingAfterScrollIfNeeded()
+void FrameView::updateLayersAndCompositingAfterScrollIfNeeded(const DoubleSize& scrollDelta)
{
// Nothing to do after scrolling if there are no fixed position elements.
if (!hasViewportConstrainedObjects())
@@ -1565,6 +1565,14 @@ void FrameView::updateLayersAndCompositingAfterScrollIfNeeded()
RefPtrWillBeRawPtr<FrameView> protect(this);
+ // Update sticky position objects which are stuck to the viewport.
+ for (const auto& viewportConstrainedObject : *m_viewportConstrainedObjects) {
+ LayoutObject* layoutObject = viewportConstrainedObject;
+ PaintLayer* layer = toLayoutBoxModelObject(layoutObject)->layer();
+ if (layoutObject->style()->position() == StickyPosition)
+ layer->updateLayerPositionAfterFrameScroll(scrollDelta);
chrishtr 2015/12/09 00:37:38 So on a scroll, first the positions of the sticky
chrishtr 2015/12/09 19:12:21 I think PaintLayerScrollableArea, line 384, needs
flackr 2015/12/10 23:43:14 All of these cases do seem to be working, but I ne
flackr 2015/12/10 23:43:15 Actually, sticky elements which have an ancestor s
+ }
+
// If there fixed position elements, scrolling may cause compositing layers to change.
// Update widget and layer positions after scrolling, but only if we're not inside of
// layout.
@@ -2070,7 +2078,7 @@ void FrameView::scrollTo(const DoublePoint& newPosition)
m_pendingScrollDelta += scrollDelta;
clearScrollAnchor();
- updateLayersAndCompositingAfterScrollIfNeeded();
+ updateLayersAndCompositingAfterScrollIfNeeded(scrollDelta);
scrollPositionChanged();
frame().loader().client()->didChangeScrollOffset();
}

Powered by Google App Engine
This is Rietveld 408576698