Changeset 158839 in webkit

Timestamp:

Nov 7, 2013 2:53:17 AM (10 years ago)

Author:

svillar@igalia.com

Message:

[CSS Grid Layout] CSSParser should reject <track-list> without a <track-size>
​https://bugs.webkit.org/show_bug.cgi?id=118025

Reviewed by Andreas Kling.

Source/WebCore:

From Blink r152914 by <​jchaffraix@chromium.org>

Make sure that we parse at least 1 <track-size> inside each
<track-list>. The old parser code allowed track-lists exclusively
made of <track-name>. The way it was implemented eases the future
addition of parsing for the repeat() function.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseGridTrackList):

• css/StyleResolver.cpp:

(WebCore::createGridTrackList): ASSERT if we don't find any
<track-size> now that we detect their absence in the parser.

LayoutTests:

Added a new test that verifies that <track-list> exclusively made
of <track-name> are not supported.

• fast/css-grid-layout/named-grid-line-get-set-expected.txt:
• fast/css-grid-layout/named-grid-line-get-set.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-06  Sergio Villar Senin  <svillar@igalia.com>
+
+        [CSS Grid Layout] CSSParser should reject <track-list> without a <track-size>
+        https://bugs.webkit.org/show_bug.cgi?id=118025
+
+        Reviewed by Andreas Kling.
+
+        Added a new test that verifies that <track-list> exclusively made
+        of <track-name> are not supported.
+
+        * fast/css-grid-layout/named-grid-line-get-set-expected.txt:
+        * fast/css-grid-layout/named-grid-line-get-set.html:
+
 2013-11-06  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt

@@ -47 +47 @@
 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
+PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-definition-columns') is "none"
+PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-definition-rows') is "none"
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html

@@ -148 +148 @@
     element.style.webkitGridDefinitionRows = "'bar";
     testValue(element, "none", "none");
+
+    element = document.createElement("div");
+    document.body.appendChild(element);
+    element.style.webkitGridDefinitionColumns = "'foo' 'bar'";
+    element.style.webkitGridDefinitionRows = "'bar' 'foo'";
+    testValue(element, "none", "none");
 </script>
 <script src="../../resources/js-test-post.js"></script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-06  Sergio Villar Senin  <svillar@igalia.com>
+
+        [CSS Grid Layout] CSSParser should reject <track-list> without a <track-size>
+        https://bugs.webkit.org/show_bug.cgi?id=118025
+
+        Reviewed by Andreas Kling.
+
+        From Blink r152914 by <jchaffraix@chromium.org>
+
+        Make sure that we parse at least 1 <track-size> inside each
+        <track-list>. The old parser code allowed track-lists exclusively
+        made of <track-name>. The way it was implemented eases the future
+        addition of parsing for the repeat() function.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseGridTrackList):
+        * css/StyleResolver.cpp:
+        (WebCore::createGridTrackList): ASSERT if we don't find any
+        <track-size> now that we detect their absence in the parser.
+
 2013-11-06  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -5024 +5024 @@
 
     RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
+    // Handle leading track names
+    while (m_valueList->current() && m_valueList->current()->unit == CSSPrimitiveValue::CSS_STRING) {
+        RefPtr<CSSPrimitiveValue> name = createPrimitiveStringValue(m_valueList->current());
+        values->append(name.release());
+        m_valueList->next();
+    }
+
+    bool seenTrackSize = false;
     while (m_valueList->current()) {
+        RefPtr<CSSPrimitiveValue> primitiveValue = parseGridTrackSize();
+        if (!primitiveValue)
+            return false;
+
+        seenTrackSize = true;
+        values->append(primitiveValue.release());
+
         while (m_valueList->current() && m_valueList->current()->unit == CSSPrimitiveValue::CSS_STRING) {
             RefPtr<CSSPrimitiveValue> name = createPrimitiveStringValue(m_valueList->current());
-            values->append(name);
+            values->append(name.release());
             m_valueList->next();
         }
-
-        // This allows trailing <string>* per the specification.
-        if (!m_valueList->current())
-            break;
-
-        RefPtr<CSSPrimitiveValue> primitiveValue = parseGridTrackSize();
-        if (!primitiveValue)
-            return false;
-
-        values->append(primitiveValue.release());
-    }
+    }
+
+    if (!seenTrackSize)
+        return false;
+
     addProperty(propId, values.release(), important);
     return true;

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1993 +1993 @@
     }
 
-    if (trackSizes.isEmpty())
-        return false;
-
+    // The parser should have rejected any <track-list> without any <track-size> as
+    // this is not conformant to the syntax.
+    ASSERT(!trackSizes.isEmpty());
     return true;
 }