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

Unified Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebaseline some tests expectations. Created 6 years, 2 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/css/parser/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleAdjuster.cpp
diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp
index dc278e60be6e74766c7a3126440e13ee641804c2..cce0938458ab0b7838fbc8fc4700fc618de0850f 100644
--- a/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/Source/core/css/resolver/StyleAdjuster.cpp
@@ -295,6 +295,16 @@ void StyleAdjuster::adjustStyleForAlignment(RenderStyle& style, const RenderStyl
style.setAlignSelfOverflowAlignment(parentStyle.alignItemsOverflowAlignment());
}
}
+
+ // Block Containers: For table cells, the behavior of the 'auto' depends on the computed
+ // value of 'vertical-align', otherwise behaves as 'start'.
+ // Flex Containers: 'auto' computes to 'flex-start'.
+ // Grid Containers: 'auto' computes to 'start', and 'stretch' behaves like 'start'.
+ if ((style.justifyContent() == ContentPositionAuto) && (style.justifyContentDistribution() == ContentDistributionDefault)) {
+ if (style.isDisplayFlexibleBox()) {
+ style.setJustifyContent(ContentPositionFlexStart);
+ }
+ }
}
void StyleAdjuster::adjustStyleForTagName(RenderStyle* style, RenderStyle* parentStyle, Element& element)
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698