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

Unified Diff: Source/core/layout/LayoutInline.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: Created 5 years, 6 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: Source/core/layout/LayoutInline.cpp
diff --git a/Source/core/layout/LayoutInline.cpp b/Source/core/layout/LayoutInline.cpp
index a7f8d2498b278cc8fcd15b269bcb1b6a5ed8e47a..8ec1947a329a59b24f93c1502b83ccf5f20f4929 100644
--- a/Source/core/layout/LayoutInline.cpp
+++ b/Source/core/layout/LayoutInline.cpp
@@ -144,7 +144,7 @@ void LayoutInline::updateFromStyle()
static LayoutObject* inFlowPositionedInlineAncestor(LayoutObject* p)
{
while (p && p->isLayoutInline()) {
- if (p->isRelPositioned())
+ if (p->isInFlowPositioned())
return p;
p = p->parent();
}
@@ -1131,7 +1131,7 @@ LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container, cons
ASSERT(container == this->container());
LayoutSize offset;
- if (isRelPositioned())
+ if (isInFlowPositioned())
offset += offsetForInFlowPosition();
offset += container->columnOffset(point);
@@ -1301,8 +1301,8 @@ LayoutSize LayoutInline::offsetForInFlowPositionedInline(const LayoutBox& child)
{
// FIXME: This function isn't right with mixed writing modes.
- ASSERT(isRelPositioned());
- if (!isRelPositioned())
+ ASSERT(isInFlowPositioned());
+ if (!isInFlowPositioned())
return LayoutSize();
// When we have an enclosing relpositioned inline, we need to add in the offset of the first line

Powered by Google App Engine
This is Rietveld 408576698