Changeset 284876 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Timestamp:

Oct 26, 2021, 10:08:08 AM (4 years ago)

Author:

Ziran Sun

Message:

Fix CSS serialization affecting grid-auto-flow
​https://bugs.webkit.org/show_bug.cgi?id=232240

Reviewed by Sergio Villar Senin.

LayoutTests/imported/w3c:

Update the following test and expectation files -

• LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set-expected.txt:
• LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html:
• LayoutTests/fast/css-grid-layout/grid-shorthand-get-set-expected.txt:
• LayoutTests/fast/css-grid-layout/grid-shorthand-get-set.html:
• web-platform-tests/css/css-grid/grid-layout-properties-expected.txt:
• web-platform-tests/css/css-grid/parsing/grid-auto-flow-computed-expected.txt:
• web-platform-tests/css/css-grid/parsing/grid-auto-flow-valid-expected.txt:
• web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/grid-auto-flow.html:

Source/WebCore:

This is to fix the serialization issue of grid-auto-flow where the word 'row' has been
included necessarily.

This Change is an import of chromium CL at
​https://chromium-review.googlesource.com/c/chromium/src/+/3179598

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeGridAutoFlow):

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -3008 +3008 @@
             auto list = CSSValueList::createSpaceSeparated();
             ASSERT(style.isGridAutoFlowDirectionRow() || style.isGridAutoFlowDirectionColumn());
-            if (style.isGridAutoFlowDirectionRow())
+            if (style.isGridAutoFlowDirectionColumn())
+                list->append(cssValuePool.createIdentifierValue(CSSValueColumn));
+            else if (!style.isGridAutoFlowAlgorithmDense())
                 list->append(cssValuePool.createIdentifierValue(CSSValueRow));
-            else
-                list->append(cssValuePool.createIdentifierValue(CSSValueColumn));
 
             if (style.isGridAutoFlowAlgorithmDense())