Changeset 47716 in webkit

Timestamp:

Aug 24, 2009 9:26:47 AM (15 years ago)

Author:

mitz@apple.com

Message:

WebCore:
background-size fails to parse if a single length/percentage/auto is followed by a comma
​https://bugs.webkit.org/show_bug.cgi?id=28674

Reviewed by Simon Fraser.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseFillSize): Added an allowComma parameter,

which is set to false when this method consumes a comma. Moved
handling of 'contain' and 'cover' from parseFillProperty into this
method.

(WebCore::CSSParser::parseFillProperty): Set allowComma to true before

processing the next value, and pass allowComma to parseFillSize.

• css/CSSParser.h:

LayoutTests:
background-size fails to parse if a single length/percentage/auto is followed by a comma
​https://bugs.webkit.org/show_bug.cgi?id=28674

Reviewed by Simon Fraser.

• fast/backgrounds/size/parsing-background-size-values-expected.txt:
• fast/backgrounds/size/resources/parsing-background-size-values.js:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/backgrounds/size/parsing-background-size-values-expected.txt (modified) (1 diff)
• LayoutTests/fast/backgrounds/size/resources/parsing-background-size-values.js (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (5 diffs)
• WebCore/css/CSSParser.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        background-size fails to parse if a single length/percentage/auto is followed by a comma
+        https://bugs.webkit.org/show_bug.cgi?id=28674
+
+        * fast/backgrounds/size/parsing-background-size-values-expected.txt:
+        * fast/backgrounds/size/resources/parsing-background-size-values.js:
+
 2009-08-24  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/LayoutTests/fast/backgrounds/size/parsing-background-size-values-expected.txt

@@ -16 +16 @@
 PASS test("background-size: 100 100 100;") is null
 PASS test("background-size: coconut;") is null
+PASS test("background-size: 100px,;") is null
+PASS test("background-size: 100px, 50%;") is "100px 100px, 50% 50%"
+PASS test("background-size: 50% 100px, 2em, 100px 50%;") is "50% 100px, 2em 2em, 100px 50%"
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/backgrounds/size/resources/parsing-background-size-values.js

@@ -26 +26 @@
 shouldBe('test("background-size: coconut;")', 'null');
 
+shouldBe('test("background-size: 100px,;")', 'null');
+shouldBe('test("background-size: 100px, 50%;")', '"100px 100px, 50% 50%"');
+shouldBe('test("background-size: 50% 100px, 2em, 100px 50%;")', '"50% 100px, 2em 2em, 100px 50%"');
+
 var successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-24  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        background-size fails to parse if a single length/percentage/auto is followed by a comma
+        https://bugs.webkit.org/show_bug.cgi?id=28674
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseFillSize): Added an allowComma parameter,
+            which is set to false when this method consumes a comma. Moved
+            handling of 'contain' and 'cover' from parseFillProperty into this
+            method.
+        (WebCore::CSSParser::parseFillProperty): Set allowComma to true before
+            processing the next value, and pass allowComma to parseFillSize.
+        * css/CSSParser.h:
+
 2009-08-17  Martin Robinson  <martin.james.robinson@gmail.com>
 

trunk/WebCore/css/CSSParser.cpp

@@ -2237 +2237 @@
 }
 
-PassRefPtr<CSSValue> CSSParser::parseFillSize()
-{
+PassRefPtr<CSSValue> CSSParser::parseFillSize(bool& allowComma)
+{
+    allowComma = true;
     CSSParserValue* value = m_valueList->current();
+
+    if (value->id == CSSValueContain || value->id == CSSValueCover)
+        return CSSPrimitiveValue::createIdentifier(value->id);
+
     RefPtr<CSSPrimitiveValue> parsedValue1;
     
@@ -2254 +2259 @@
         if (value->id == CSSValueAuto)
             parsedValue2 = CSSPrimitiveValue::create(0, CSSPrimitiveValue::CSS_UNKNOWN);
+        else if (value->unit == CSSParserValue::Operator && value->iValue == ',')
+            allowComma = false;
         else {
             if (!validUnit(value, FLength|FPercent, m_strict))
@@ -2296 +2303 @@
             allowComma = false;
         } else {
+            allowComma = true;
             switch (propId) {
                 case CSSPropertyBackgroundColor:
@@ -2378 +2386 @@
                 case CSSPropertyBackgroundSize:
                 case CSSPropertyWebkitMaskSize: {
-                    if (val->id == CSSValueContain || val->id == CSSValueCover) {
-                        currValue = CSSPrimitiveValue::createIdentifier(val->id);
+                    currValue = parseFillSize(allowComma);
+                    if (currValue)
                         m_valueList->next();
-                    } else {
-                        currValue = parseFillSize();
-                        if (currValue)
-                            m_valueList->next();
-                    }
                     break;
                 }
@@ -2412 +2415 @@
                     value2 = currValue2.release();
             }
-            allowComma = true;
         }
         

trunk/WebCore/css/CSSParser.h

@@ -83 +83 @@
         PassRefPtr<CSSValue> parseFillPositionXY(bool& xFound, bool& yFound);
         void parseFillPosition(RefPtr<CSSValue>&, RefPtr<CSSValue>&);
-        PassRefPtr<CSSValue> parseFillSize();
+        PassRefPtr<CSSValue> parseFillSize(bool &allowComma);
         
         bool parseFillProperty(int propId, int& propId1, int& propId2, RefPtr<CSSValue>&, RefPtr<CSSValue>&);