Changeset 51600 in webkit

Timestamp:

Dec 2, 2009 7:33:31 AM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=32045, make sure escape sequences work with
all the @-rules we support. When escape sequences are present, the lexical scanner
just returns a generic token name: ATKEYWORD. We have to process the escape sequences
and then recheck against the rules we support with the final processed name. If we
find a match, we mutate the token value to the appropriate rule name token, e.g.,
NAMESPACE_SYM.

Reviewed by Dan Bernstein.

Added fast/css/namespaces/namespaces-escapes.xml

• css/CSSParser.cpp:

(WebCore::CSSParser::lex):
(WebCore::CSSParser::recheckAtKeyword):
(WebCore::CSSParser::text):

• css/CSSParser.h:

Location:

trunk

Files:

• LayoutTests/fast/css/namespaces/namespaces-escapes.xml (added)
• LayoutTests/platform/mac/fast/css/namespaces/namespaces-escapes-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/namespaces/namespaces-escapes-expected.png (added)
• LayoutTests/platform/mac/fast/css/namespaces/namespaces-escapes-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (6 diffs)
• WebCore/css/CSSParser.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-01  Dave Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32045, make sure escape sequences work with
+        all the @-rules we support.  When escape sequences are present, the lexical scanner
+        just returns a generic token name: ATKEYWORD.  We have to process the escape sequences
+        and then recheck against the rules we support with the final processed name.  If we
+        find a match, we mutate the token value to the appropriate rule name token, e.g.,
+        NAMESPACE_SYM.
+
+        Added fast/css/namespaces/namespaces-escapes.xml
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::lex):
+        (WebCore::CSSParser::recheckAtKeyword):
+        (WebCore::CSSParser::text):
+        * css/CSSParser.h:
+
 2009-12-02  Anton Muhin  <antonm@chromium.org>
 

trunk/WebCore/css/CSSParser.cpp

@@ -4619 +4619 @@
 {
     YYSTYPE* yylval = static_cast<YYSTYPE*>(yylvalWithoutType);
-    int token = lex();
     int length;
+    
+    lex();
+
     UChar* t = text(&length);
 
-    switch (token) {
+    switch (token()) {
     case WHITESPACE:
     case SGML_CD:
@@ -4689 +4691 @@
     }
 
-    return token;
+    return token();
 }
 
@@ -4695 +4697 @@
 {
     return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\f';
+}
+
+void CSSParser::recheckAtKeyword(const UChar* str, int len)
+{
+    String ruleName(str, len);
+    if (equalIgnoringCase(ruleName, "@import"))
+        yyTok = IMPORT_SYM;
+    else if (equalIgnoringCase(ruleName, "@page"))
+        yyTok = PAGE_SYM;
+    else if (equalIgnoringCase(ruleName, "@media"))
+        yyTok = MEDIA_SYM;
+    else if (equalIgnoringCase(ruleName, "@font-face"))
+        yyTok = FONT_FACE_SYM;
+    else if (equalIgnoringCase(ruleName, "@charset"))
+        yyTok = CHARSET_SYM;
+    else if (equalIgnoringCase(ruleName, "@namespace"))
+        yyTok = NAMESPACE_SYM;
+    else if (equalIgnoringCase(ruleName, "@-webkit-keyframes"))
+        yyTok = WEBKIT_KEYFRAMES_SYM;
+    else if (equalIgnoringCase(ruleName, "@-webkit-mediaquery"))
+        yyTok = WEBKIT_MEDIAQUERY_SYM;
+    // FIXME: Add CSS Variables if we ever decide to turn it back on.
 }
 
@@ -4749 +4773 @@
     UChar* out = start;
     UChar* escape = 0;
+
+    bool sawEscape = false;
 
     for (int i = 0; i < l; i++) {
@@ -4794 +4820 @@
         if (!escape && *current == '\\') {
             escape = current;
+            sawEscape = true;
             continue;
         }
@@ -4814 +4841 @@
     
     *length = out - start;
+    
+    // If we have an unrecognized @-keyword, and if we handled any escapes at all, then
+    // we should attempt to adjust yyTok to the correct type.
+    if (yyTok == ATKEYWORD && sawEscape)
+        recheckAtKeyword(start, *length);
+
     return start;
 }

trunk/WebCore/css/CSSParser.h

@@ -226 +226 @@
         
     private:
+        void recheckAtKeyword(const UChar* str, int len);
+    
         void clearProperties();