Changeset 56187 in webkit

Timestamp:

Mar 18, 2010 1:37:47 PM (14 years ago)

Author:

hyatt@apple.com

Message:

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

Reviewed by Simon Fraser.

Make sure :not does not allow pseudo-elements inside it. (Hooray for another pointless
restriction on :not.)

Added fast/css/invalid-not-with-pseudo-element.html

• css/CSSGrammar.y:
• css/CSSSelector.h:

(WebCore::CSSSelector::matchesPseudoElement):

Location:

trunk

Files:

• LayoutTests/fast/css/invalid-not-with-pseudo-element-expected.txt (added)
• LayoutTests/fast/css/invalid-not-with-pseudo-element.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSGrammar.y (modified) (1 diff)
• WebCore/css/CSSSelector.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-18  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36275
+
+        Make sure :not does not allow pseudo-elements inside it. (Hooray for another pointless
+        restriction on :not.)
+
+        Added fast/css/invalid-not-with-pseudo-element.html
+
+        * css/CSSGrammar.y:
+        * css/CSSSelector.h:
+        (WebCore::CSSSelector::matchesPseudoElement):
+
 2010-03-18  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -1166 +1166 @@
     // used by :not
     | ':' NOTFUNCTION maybe_space simple_selector maybe_space ')' {
-        if (!$4 || $4->simpleSelector() || $4->tagHistory())
+        if (!$4 || $4->simpleSelector() || $4->tagHistory() || $4->matchesPseudoElement())
             $$ = 0;
         else {

trunk/WebCore/css/CSSSelector.h

@@ -213 +213 @@
         bool matchNth(int count);
 
+        bool matchesPseudoElement() const 
+        { 
+            if (m_pseudoType == PseudoUnknown)
+                extractPseudoType();
+            return m_match == PseudoElement;
+        }
+
         Relation relation() const { return static_cast<Relation>(m_relation); }