Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 23472008: [CSS Grid Layout] Support calc() breadth 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: Source/core/css/CSSComputedStyleDeclaration.cpp

Issue 23472008: [CSS Grid Layout] Support calc() breadth track size (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@103761-wk

Patch Set: Patch for landing Created 7 years, 1 month 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 | « LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js ('k') | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSComputedStyleDeclaration.cpp

diff --git a/Source/core/css/CSSComputedStyleDeclaration.cpp b/Source/core/css/CSSComputedStyleDeclaration.cpp

index caade9bd6eba3ad131377cd578c39b6f4baa3d87..16bd6b65b61ebd953eb5a679da0093000de55f9f 100644

--- a/Source/core/css/CSSComputedStyleDeclaration.cpp

+++ b/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -965,7 +965,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::valueForFilter(const RenderObj

return list.release();

}

-static PassRefPtr<CSSValue> valueForGridTrackBreadth(const GridLength& trackBreadth, const RenderStyle& style, RenderView* renderView)

+static PassRefPtr<CSSValue> specifiedValueForGridTrackBreadth(const GridLength& trackBreadth, const RenderStyle& style, RenderView* renderView)

{

if (!trackBreadth.isLength())

return cssValuePool().createValue(trackBreadth.flex(), CSSPrimitiveValue::CSS_FR);

@@ -982,11 +982,11 @@ static PassRefPtr<CSSValue> specifiedValueForGridTrackSize(const GridTrackSize&

{

switch (trackSize.type()) {

case LengthTrackSizing:

- return valueForGridTrackBreadth(trackSize.length(), style, renderView);

+ return specifiedValueForGridTrackBreadth(trackSize.length(), style, renderView);

case MinMaxTrackSizing:

RefPtr<CSSValueList> minMaxTrackBreadths = CSSValueList::createCommaSeparated();

- minMaxTrackBreadths->append(valueForGridTrackBreadth(trackSize.minTrackBreadth(), style, renderView));

- minMaxTrackBreadths->append(valueForGridTrackBreadth(trackSize.maxTrackBreadth(), style, renderView));

+ minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style, renderView));

+ minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.maxTrackBreadth(), style, renderView));

return CSSFunctionValue::create("minmax(", minMaxTrackBreadths);

}

ASSERT_NOT_REACHED();