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

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: 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/LayoutInline.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutInline.cpp
diff --git a/Source/core/layout/LayoutInline.cpp b/Source/core/layout/LayoutInline.cpp
index 0fe8e2b0a77bdd1f253d198a9ca24e3bf33d950c..2e69d84ce6fb509a3d88f4fcd32113dfb9249dd5 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();
}
@@ -1129,7 +1129,7 @@ LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container, cons
ASSERT(container == this->container());
LayoutSize offset;
- if (isRelPositioned())
+ if (isInFlowPositioned())
offset += offsetForInFlowPosition();
offset += container->columnOffset(point);
@@ -1299,8 +1299,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
« no previous file with comments | « Source/core/layout/LayoutInline.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698