Changeset 208277 in webkit

Timestamp:

Nov 2, 2016 5:40:23 AM (7 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] mimax(auto, <flex>) should be serialized as <flex>
​https://bugs.webkit.org/show_bug.cgi?id=164316

Reviewed by Sergio Villar Senin.

Source/WebCore:

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::specifiedValueForGridTrackSize): Add a simple if to serialize
properly this case.

• rendering/style/GridLength.h:

(WebCore::GridLength::isAuto): Add new function to check if GridLength
is or not "auto".

LayoutTests:

Add new test case to verify it. We can only check it
using grid-auto-columns|rows, because grid-template-columns|rows
is serialized to the used breadth.

• fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
• fast/css-grid-layout/grid-auto-columns-rows-get-set.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/GridLength.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-02  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] mimax(auto, <flex>) should be serialized as <flex>
+        https://bugs.webkit.org/show_bug.cgi?id=164316
+
+        Reviewed by Sergio Villar Senin.
+
+        Add new test case to verify it. We can only check it
+        using grid-auto-columns|rows, because grid-template-columns|rows
+        is serialized to the used breadth.
+
+        * fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
+        * fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
+
 2016-11-02  Romain Bellessort  <romain.bellessort@crf.canon.fr>
 

trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt

@@ -53 +53 @@
 PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "fit-content(10px) fit-content(30%)"
 PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "fit-content(5%) fit-content(40px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "2fr"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "1fr"
 
 Test setting grid-auto-columns and grid-auto-rows to bad minmax value through JS

trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html

@@ -124 +124 @@
 testAutoValues("minmax(-webkit-min-content, 10px) 48px 5%", "auto 30px minmax(10%, 60%)");
 testAutoValues("fit-content(10px) fit-content(30%)", "fit-content(5%) fit-content(calc(20px + 2em))", "fit-content(10px) fit-content(30%)", "fit-content(5%) fit-content(40px)");
+testAutoValues("minmax(auto, 2fr)", "minmax(auto, 1fr)", "2fr", "1fr");
 
 debug("");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-02  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] mimax(auto, <flex>) should be serialized as <flex>
+        https://bugs.webkit.org/show_bug.cgi?id=164316
+
+        Reviewed by Sergio Villar Senin.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::specifiedValueForGridTrackSize): Add a simple if to serialize
+        properly this case.
+        * rendering/style/GridLength.h:
+        (WebCore::GridLength::isAuto): Add new function to check if GridLength
+        is or not "auto".
+
 2016-11-02  Romain Bellessort  <romain.bellessort@crf.canon.fr>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1013 +1013 @@
     default:
         ASSERT(trackSize.type() == MinMaxTrackSizing);
+        if (trackSize.minTrackBreadth().isAuto() && trackSize.maxTrackBreadth().isFlex())
+            return CSSValuePool::singleton().createValue(trackSize.maxTrackBreadth().flex(), CSSPrimitiveValue::CSS_FR);
+
         auto minMaxTrackBreadths = CSSValueList::createCommaSeparated();
         minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style));

trunk/Source/WebCore/rendering/style/GridLength.h

@@ -73 +73 @@
 
     bool isContentSized() const { return m_type == LengthType && (m_length.isAuto() || m_length.isMinContent() || m_length.isMaxContent()); }
+    bool isAuto() const { return m_type == LengthType && m_length.isAuto(); }
 
 private: