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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Issue 2383113003: Refactor ScrollableArea::setScrollPosition. (Closed)
Patch Set: Created 4 years, 2 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
Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index b0f3799611072834c4350877cedd407ccfc88ef2..cffaf0d24ea409cc3423146e11ba1fe9b875bf26 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -787,7 +787,7 @@ void LayoutBoxModelObject::updateStickyPositionConstraints() const {
FloatSize scrollOffset(
scrollAncestor
? toFloatSize(
- scrollAncestor->getScrollableArea()->adjustedScrollOffset())
+ scrollAncestor->getScrollableArea()->offsetFromOrigin())
: FloatSize());
scrollContainerRelativePaddingBoxRect.move(scrollOffset);
}
@@ -908,7 +908,7 @@ FloatRect LayoutBoxModelObject::computeStickyConstrainingRect() const {
FloatRect constrainingRect;
constrainingRect =
FloatRect(enclosingClippingBox->overflowClipRect(LayoutPoint(DoublePoint(
- enclosingClippingBox->getScrollableArea()->adjustedScrollOffset()))));
+ enclosingClippingBox->getScrollableArea()->offsetFromOrigin()))));
constrainingRect.move(enclosingClippingBox->paddingLeft(),
enclosingClippingBox->paddingTop());
constrainingRect.contract(

Powered by Google App Engine
This is Rietveld 408576698