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

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

Issue 1212893005: Add position: sticky as supported position value when CSSStickyPosition is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merge, convert pixel to ref tests, and address comments. Created 5 years, 5 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/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutInline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/Source/core/layout/LayoutBoxModelObject.cpp b/Source/core/layout/LayoutBoxModelObject.cpp
index b422994e2f9d2cebf1714b5a26baa8c301b1d240..6a93d710c15beee74052f68bf7f72cff25d9460f 100644
--- a/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/Source/core/layout/LayoutBoxModelObject.cpp
@@ -454,12 +454,12 @@ void LayoutBoxModelObject::updateFromStyle()
static LayoutSize accumulateInFlowPositionOffsets(const LayoutObject* child)
{
- if (!child->isAnonymousBlock() || !child->isRelPositioned())
+ if (!child->isAnonymousBlock() || !child->isInFlowPositioned())
return LayoutSize();
LayoutSize offset;
LayoutObject* p = toLayoutBlock(child)->inlineElementContinuation();
while (p && p->isLayoutInline()) {
- if (p->isRelPositioned()) {
+ if (p->isInFlowPositioned()) {
LayoutInline* layoutInline = toLayoutInline(p);
offset += layoutInline->offsetForInFlowPosition();
}
@@ -576,7 +576,7 @@ LayoutPoint LayoutBoxModelObject::adjustedPositionRelativeToOffsetParent(const L
if (offsetParent->isBox() && !offsetParent->isBody())
referencePoint.move(-toLayoutBox(offsetParent)->borderLeft(), -toLayoutBox(offsetParent)->borderTop());
if (!isOutOfFlowPositioned() || flowThreadContainingBlock()) {
- if (isRelPositioned())
+ if (isInFlowPositioned())
referencePoint.move(relativePositionOffset());
LayoutObject* current;
« no previous file with comments | « Source/core/layout/LayoutBox.cpp ('k') | Source/core/layout/LayoutInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698