Changeset 55308 in webkit

Timestamp:

Feb 26, 2010 1:43:44 PM (14 years ago)

Author:

senorblanco@chromium.org

Message:

2010-02-24 Stephen White <​senorblanco@chromium.org>

Reviewed by Darin Adler.

This CL implements a simple ad-hoc parser for CSS rgb() values.
If it fails, it returns false and the normal lex/yacc parser will
be invoked.

​https://bugs.webkit.org/show_bug.cgi?id=35362

Covered by fast/canvas/canvas-bg.html, fast/canvas/canvas-bg-zoom.html,
and many more.

• css/CSSParser.cpp: (WebCore::parseInt): (WebCore::CSSParser::parseColor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSParser.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-24  Stephen White  <senorblanco@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        This CL implements a simple ad-hoc parser for CSS rgb() values.
+        If it fails, it returns false and the normal lex/yacc parser will
+        be invoked.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=35362
+
+        Covered by fast/canvas/canvas-bg.html, fast/canvas/canvas-bg-zoom.html,
+        and many more.
+
+        * css/CSSParser.cpp:
+        (WebCore::parseInt):
+        (WebCore::CSSParser::parseColor):
+
 2010-02-26  Jarkko Sakkinen  <jarkko.sakkinen@tieto.com>
 

trunk/WebCore/css/CSSParser.cpp

@@ -3492 +3492 @@
 }
 
+static inline bool isCSSWhitespace(UChar c)
+{
+    return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f';
+}
+
+static inline bool parseInt(const UChar*& string, const UChar* end, UChar terminator, int& value)
+{
+    const UChar* current = string;
+    int localValue = 0;
+    while (current != end && isCSSWhitespace(*current)) 
+        current++;
+    if (current == end || !isASCIIDigit(*current))
+        return false;
+    while (current != end && isASCIIDigit(*current))
+        localValue = localValue * 10 + *current++ - '0';
+    while (current != end && isCSSWhitespace(*current))
+        current++;
+    if (current == end || *current++ != terminator)
+        return false;
+    value = localValue;
+    string = current;
+    return true;
+}
+
 bool CSSParser::parseColor(const String &name, RGBA32& rgb, bool strict)
 {
@@ -3504 +3528 @@
         return true;
     }
-
+    if (name.startsWith("rgb(")) {
+        const UChar* current = name.characters() + 4;
+        const UChar* end = name.characters() + name.length();
+        int red;
+        int green;
+        int blue;
+        if (!parseInt(current, end, ',', red))
+            return false;
+        if (!parseInt(current, end, ',', green))
+            return false;
+        if (!parseInt(current, end, ')', blue))
+            return false;
+        if (current != end)
+            return false;
+        rgb = makeRGB(red, green, blue);
+        return true;
+    }
     return false;
 }
@@ -4703 +4743 @@
 }
 
-static inline bool isCSSWhitespace(UChar c)
-{
-    return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f';
-}
-
 void CSSParser::recheckAtKeyword(const UChar* str, int len)
 {