Changeset 29976 in webkit

Timestamp:

Feb 4, 2008 2:12:16 PM (16 years ago)

Author:

hyatt@apple.com

Message:

Fix for bug 16751, misparsing of html*.test in CSS.

Reviewed by darin

Added fast/css/simple-selector-chain-parsing.html

• css/CSSGrammar.y:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSGrammar.y (modified) (11 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-04  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 16751, misparsing of html*.test in CSS.
+
+        Reviewed by darin
+
+        Added fast/css/simple-selector-chain-parsing.html
+
+        * css/CSSGrammar.y:
+
 2008-02-04  Darin Adler  <darin@apple.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -263 +263 @@
 %type <selector> selector
 %type <selector> selector_list
+%type <selector> selector_with_trailing_whitespace
 %type <selector> class
 %type <selector> attrib
@@ -576 +577 @@
   | '~' maybe_space { $$ = CSSSelector::IndirectAdjacent; }
   | '>' maybe_space { $$ = CSSSelector::Child; }
-  | /* empty */ { $$ = CSSSelector::Descendant; }
   ;
 
@@ -607 +607 @@
    ;
 
+selector_with_trailing_whitespace:
+    selector WHITESPACE {
+        $$ = $1;
+    }
+    ;
+
 selector:
     simple_selector {
         $$ = $1;
+    }
+    | selector_with_trailing_whitespace
+    {
+        $$ = $1;
+    }
+    | selector_with_trailing_whitespace simple_selector
+    {
+        $$ = $2;
+        if (!$1)
+            $$ = 0;
+        else if ($$) {
+            CSSParser* p = static_cast<CSSParser*>(parser);
+            CSSSelector* end = $$;
+            while (end->m_tagHistory)
+                end = end->m_tagHistory;
+            end->m_relation = CSSSelector::Descendant;
+            end->m_tagHistory = p->sinkFloatingSelector($1);
+            if (Document* doc = p->document())
+                doc->setUsesDescendantRules(true);
+        }
     }
     | selector combinator simple_selector {
@@ -622 +648 @@
             end->m_relation = $2;
             end->m_tagHistory = p->sinkFloatingSelector($1);
-            if ($2 == CSSSelector::Descendant || $2 == CSSSelector::Child) {
+            if ($2 == CSSSelector::Child) {
                 if (Document* doc = p->document())
                     doc->setUsesDescendantRules(true);
@@ -641 +667 @@
     | IDENT '|' { $$ = $1; }
 ;
-
+    
 simple_selector:
-    element_name maybe_space {
+    element_name {
         CSSParser* p = static_cast<CSSParser*>(parser);
         $$ = p->createFloatingSelector();
         $$->m_tag = QualifiedName(nullAtom, atomicString($1), p->defaultNamespace);
     }
-    | element_name specifier_list maybe_space {
+    | element_name specifier_list {
         $$ = $2;
         if ($$) {
@@ -655 +681 @@
         }
     }
-    | specifier_list maybe_space {
+    | specifier_list {
         $$ = $1;
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -661 +687 @@
             $$->m_tag = QualifiedName(nullAtom, starAtom, p->defaultNamespace);
     }
-    | namespace_selector element_name maybe_space {
+    | namespace_selector element_name {
         AtomicString namespacePrefix = atomicString($1);
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -672 +698 @@
             $$->m_tag = QualifiedName(nullAtom, atomicString($2), p->defaultNamespace);
     }
-    | namespace_selector element_name specifier_list maybe_space {
+    | namespace_selector element_name specifier_list {
         $$ = $3;
         if ($$) {
@@ -685 +711 @@
         }
     }
-    | namespace_selector specifier_list maybe_space {
+    | namespace_selector specifier_list {
         $$ = $2;
         if ($$) {
@@ -857 +883 @@
         else if (type == CSSSelector::PseudoEmpty ||
                  type == CSSSelector::PseudoFirstChild ||
-                 type == CSSSelector::PseudoFirstOfType ||
-                 type == CSSSelector::PseudoLastChild ||
-                 type == CSSSelector::PseudoLastOfType) {
+                 type == CSSSelector::PseudoFirstOfType) {
             CSSParser* p = static_cast<CSSParser*>(parser);
             Document* doc = p->document();
@@ -895 +919 @@
     }
     // used by :not
-    | ':' NOTFUNCTION maybe_space simple_selector ')' {
+    | ':' NOTFUNCTION maybe_space simple_selector maybe_space ')' {
         if (!$4)
             $$ = 0;