third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl - Issue 1920173002: Reland [css-grid] Implement auto-repeat computation

Unified Diff: third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

Issue 1920173002: Reland [css-grid] Implement auto-repeat computation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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/LayoutTests/fast/css-grid-layout/mozilla/grid-repeat-auto-fill-fit-005-expected.html ('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/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

diff --git a/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

index 7a7711ac26e04c14342e835c80ad6f792e93d789..d49aae79b2e64ee6ff76a532f233f2e71c6da644 100644

--- a/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

+++ b/third_party/WebKit/Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl

@@ -460,12 +460,12 @@ static bool borderImageLengthMatchesAllSides(const BorderImageLengthBox& borderI

{

Vector<GridTrackSize> trackSizes;

Vector<GridTrackSize> autoRepeatTrackSizes;

- size_t autoRepeatInsertionPoint;

NamedGridLinesMap namedGridLines;

OrderedNamedGridLines orderedNamedGridLines;

NamedGridLinesMap autoRepeatNamedGridLines;

OrderedNamedGridLines autoRepeatOrderedNamedGridLines;

- AutoRepeatType autoRepeatType;

+ AutoRepeatType autoRepeatType = ComputedStyle::initialGridAutoRepeatType();

+ size_t autoRepeatInsertionPoint = ComputedStyle::initialGridAutoRepeatInsertionPoint();

StyleBuilderConverter::convertGridTrackList(*value, trackSizes, namedGridLines, orderedNamedGridLines, autoRepeatTrackSizes, autoRepeatNamedGridLines, autoRepeatOrderedNamedGridLines, autoRepeatInsertionPoint, autoRepeatType, state);

const NamedGridAreaMap& namedGridAreas = state.style()->namedGridArea();

if (!namedGridAreas.isEmpty())

@@ -473,13 +473,11 @@ static bool borderImageLengthMatchesAllSides(const BorderImageLengthBox& borderI

state.style()->setGridTemplate{{type}}s(trackSizes);

state.style()->setNamedGrid{{type}}Lines(namedGridLines);

state.style()->setOrderedNamedGrid{{type}}Lines(orderedNamedGridLines);

- if (autoRepeatTrackSizes.size()) {

- state.style()->setGridAutoRepeat{{type}}s(autoRepeatTrackSizes);

- state.style()->setGridAutoRepeat{{type}}sInsertionPoint(autoRepeatInsertionPoint);

- state.style()->setAutoRepeatNamedGrid{{type}}Lines(autoRepeatNamedGridLines);

- state.style()->setAutoRepeatOrderedNamedGrid{{type}}Lines(autoRepeatOrderedNamedGridLines);

- state.style()->setGridAutoRepeatType(autoRepeatType);

- }

+ state.style()->setGridAutoRepeat{{type}}s(autoRepeatTrackSizes);

+ state.style()->setGridAutoRepeat{{type}}sInsertionPoint(autoRepeatInsertionPoint);

+ state.style()->setAutoRepeatNamedGrid{{type}}Lines(autoRepeatNamedGridLines);

+ state.style()->setAutoRepeatOrderedNamedGrid{{type}}Lines(autoRepeatOrderedNamedGridLines);

+ state.style()->setGridAutoRepeatType(autoRepeatType);

}

{% endmacro %}

{{apply_grid_template('CSSPropertyGridTemplateColumns', 'Column')}}