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

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2614093002: Combine LayoutObject::previousPaintOffset and paintOffset in paint properties (Closed)
Patch Set: Resolve conflict Created 3 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
Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index db51ceb6751378e0f7129ebb7f900e52d43fcecb..c55db95b238e21818a63efe71bb5bc54e78b11c0 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -340,19 +340,19 @@ bool PaintLayer::sticksToViewport() const {
->view()
->paintProperties()
->localBorderBoxProperties()
- ->propertyTreeState.scroll();
+ ->scroll();
} else {
ancestorTargetScrollNode = layoutObject()
->view()
->paintProperties()
->contentsProperties()
- .propertyTreeState.scroll();
+ .scroll();
}
return layoutObject()
->paintProperties()
->localBorderBoxProperties()
- ->propertyTreeState.scroll() == ancestorTargetScrollNode;
+ ->scroll() == ancestorTargetScrollNode;
}
return (layoutObject()->style()->position() == FixedPosition &&
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintInvalidator.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerClipper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698