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

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

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Applied suggested changes. Created 4 years, 9 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/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 19a44fa575637f77d5753f2562537344ed6d13fc..efbd9413cf92c851339973f5b99c9066e37a0fb5 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2248,7 +2248,7 @@ static bool columnFlexItemHasStretchAlignment(const LayoutObject* flexitem)
ASSERT(parent->style()->isColumnFlexDirection());
if (flexitem->style()->marginStart().isAuto() || flexitem->style()->marginEnd().isAuto())
return false;
- return flexitem->style()->alignSelfPosition() == ItemPositionStretch || (flexitem->style()->alignSelfPosition() == ItemPositionAuto && parent->style()->alignItemsPosition() == ItemPositionStretch);
+ return flexitem->styleRef().resolvedAlignSelf(parent->styleRef(), ItemPositionStretch).position() == ItemPositionStretch;
}
static bool isStretchingColumnFlexItem(const LayoutObject* flexitem)
@@ -2276,8 +2276,8 @@ bool LayoutBox::hasStretchedLogicalWidth() const
return false;
}
if (cb->isHorizontalWritingMode() != isHorizontalWritingMode())
- return ComputedStyle::resolveAlignment(cb->styleRef(), style, ItemPositionStretch) == ItemPositionStretch;
- return ComputedStyle::resolveJustification(cb->styleRef(), style, ItemPositionStretch) == ItemPositionStretch;
+ return style.resolvedAlignSelf(cb->styleRef(), ItemPositionStretch).position() == ItemPositionStretch;
+ return style.resolvedJustifySelf(cb->styleRef(), ItemPositionStretch).position() == ItemPositionStretch;
}
bool LayoutBox::sizesLogicalWidthToFitContent(const Length& logicalWidth) const

Powered by Google App Engine
This is Rietveld 408576698