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

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

Issue 2287113004: [css-grid] Implement fit-content track size (Closed)
Patch Set: Created 4 years, 4 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/css/resolver/StyleBuilderConverter.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
index f5fd517ea29aae3e3030fdd65613753660cce5f8..46fa316c43063d3fe4ca80db43578bbba8c9d995 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp
@@ -539,10 +539,13 @@ GridTrackSize StyleBuilderConverter::convertGridTrackSize(StyleResolverState& st
if (value.isPrimitiveValue())
return GridTrackSize(convertGridTrackBreadth(state, toCSSPrimitiveValue(value)));
- const CSSFunctionValue& minmaxFunction = toCSSFunctionValue(value);
- ASSERT_WITH_SECURITY_IMPLICATION(minmaxFunction.length() == 2);
- GridLength minTrackBreadth(convertGridTrackBreadth(state, toCSSPrimitiveValue(minmaxFunction.item(0))));
- GridLength maxTrackBreadth(convertGridTrackBreadth(state, toCSSPrimitiveValue(minmaxFunction.item(1))));
+ auto& function = toCSSFunctionValue(value);
+ if (function.functionType() == CSSValueFitContent)
Manuel Rego 2016/08/31 07:24:29 Probably would be nice to add an assert to verify
svillar 2016/08/31 09:50:04 Acknowledged.
+ return GridTrackSize(convertGridTrackBreadth(state, toCSSPrimitiveValue(function.item(0))), FitContentTrackSizing);
+
+ SECURITY_DCHECK(function.length() == 2);
+ GridLength minTrackBreadth(convertGridTrackBreadth(state, toCSSPrimitiveValue(function.item(0))));
+ GridLength maxTrackBreadth(convertGridTrackBreadth(state, toCSSPrimitiveValue(function.item(1))));
return GridTrackSize(minTrackBreadth, maxTrackBreadth);
}

Powered by Google App Engine
This is Rietveld 408576698