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

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

Issue 2915773002: Reland of [css-align] Don't resolve 'auto' values for computed style. (Closed)
Patch Set: Applied suggested changes Created 3 years, 7 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 a7da0f04a8fe7ce16767db5c30c3b6f38f9eb0f0..628f06186ca765cbfcbb9209a786882395e3481c 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -2849,7 +2849,7 @@ bool LayoutBox::ColumnFlexItemHasStretchAlignment() const {
return StyleRef()
.ResolvedAlignSelf(
ContainingBlock()->SelfAlignmentNormalBehavior(),
- IsAnonymous() ? &parent_style : nullptr)
+ &parent_style)
.GetPosition() == kItemPositionStretch;
}
@@ -2883,15 +2883,14 @@ bool LayoutBox::HasStretchedLogicalWidth() const {
// Flexbox Items, which obviously should have a container.
return false;
}
- const ComputedStyle* parent_style = IsAnonymous() ? cb->Style() : nullptr;
if (cb->IsHorizontalWritingMode() != IsHorizontalWritingMode())
return style
.ResolvedAlignSelf(cb->SelfAlignmentNormalBehavior(this),
- parent_style)
+ cb->Style())
.GetPosition() == kItemPositionStretch;
return style
.ResolvedJustifySelf(cb->SelfAlignmentNormalBehavior(this),
- parent_style)
+ cb->Style())
.GetPosition() == kItemPositionStretch;
}

Powered by Google App Engine
This is Rietveld 408576698