third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp - Issue 2287113004: [css-grid] Implement fit-content track size

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2287113004: [css-grid] Implement fit-content track size (Closed)

Patch Set: Patch for landing 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

« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..9b7ad5e89bc8d6a1e9b0b248256fdeafec9637a9 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -539,10 +539,15 @@ 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) {

+ SECURITY_DCHECK(function.length() == 1);

+ 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);

}