Changeset 29933 in webkit

Timestamp:

Feb 2, 2008 2:46:36 AM (16 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

Fix for bug 4812. Support last-child and last-of-type CSS3 selectors. Brings Acid3 score up to 68/100.

Reviewed by olliej

Added fast/css/last-child-pseudo-class.html, fast/css/last-of-type-pseudo-class.html

• css/CSSGrammar.y:
• css/CSSSelector.cpp: (WebCore::CSSSelector::extractPseudoType):
• css/CSSSelector.h: (WebCore::CSSSelector::):
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::checkOneSelector):

LayoutTests:

Fix for bug 4812. Support last-child and last-of-type (and make sure they are properly dynamic).

Reviewed by olliej

• fast/css/last-child-pseudo-class.html: Added.
• fast/css/last-of-type-pseudo-class.html: Added.
• platform/mac/fast/css/last-child-pseudo-class-expected.checksum: Added.
• platform/mac/fast/css/last-child-pseudo-class-expected.png: Added.
• platform/mac/fast/css/last-child-pseudo-class-expected.txt: Added.
• platform/mac/fast/css/last-of-type-pseudo-class-expected.checksum: Added.
• platform/mac/fast/css/last-of-type-pseudo-class-expected.png: Added.
• platform/mac/fast/css/last-of-type-pseudo-class-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/last-child-pseudo-class.html (added)
• LayoutTests/fast/css/last-of-type-pseudo-class.html (added)
• LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.png (added)
• LayoutTests/platform/mac/fast/css/last-child-pseudo-class-expected.txt (added)
• LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.checksum (added)
• LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.png (added)
• LayoutTests/platform/mac/fast/css/last-of-type-pseudo-class-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSGrammar.y (modified) (1 diff)
• WebCore/css/CSSSelector.cpp (modified) (2 diffs)
• WebCore/css/CSSSelector.h (modified) (2 diffs)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-02  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 4812.  Support last-child and last-of-type (and make sure they are properly dynamic).
+
+        Reviewed by olliej
+
+        * fast/css/last-child-pseudo-class.html: Added.
+        * fast/css/last-of-type-pseudo-class.html: Added.
+        * platform/mac/fast/css/last-child-pseudo-class-expected.checksum: Added.
+        * platform/mac/fast/css/last-child-pseudo-class-expected.png: Added.
+        * platform/mac/fast/css/last-child-pseudo-class-expected.txt: Added.
+        * platform/mac/fast/css/last-of-type-pseudo-class-expected.checksum: Added.
+        * platform/mac/fast/css/last-of-type-pseudo-class-expected.png: Added.
+        * platform/mac/fast/css/last-of-type-pseudo-class-expected.txt: Added.
+
 2008-02-01  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-02  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 4812. Support last-child and last-of-type CSS3 selectors.  Brings Acid3 score up to 68/100.
+
+        Reviewed by olliej
+
+        Added fast/css/last-child-pseudo-class.html, fast/css/last-of-type-pseudo-class.html
+
+        * css/CSSGrammar.y:
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::extractPseudoType):
+        * css/CSSSelector.h:
+        (WebCore::CSSSelector::):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::checkOneSelector):
+
 2008-02-01  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -857 +857 @@
         else if (type == CSSSelector::PseudoEmpty ||
                  type == CSSSelector::PseudoFirstChild ||
-                 type == CSSSelector::PseudoFirstOfType) {
+                 type == CSSSelector::PseudoFirstOfType ||
+                 type == CSSSelector::PseudoLastChild ||
+                 type == CSSSelector::PseudoLastOfType) {
             CSSParser* p = static_cast<CSSParser*>(parser);
             Document* doc = p->document();

trunk/WebCore/css/CSSSelector.cpp

@@ -88 +88 @@
     static AtomicString hover("hover");
     static AtomicString indeterminate("indeterminate");
+    static AtomicString lastChild("last-child");
+    static AtomicString lastOfType("last-of-type");
     static AtomicString link("link");
     static AtomicString lang("lang(");
@@ -142 +144 @@
     else if (m_value == firstChild)
         m_pseudoType = PseudoFirstChild;
+    else if (m_value == lastChild)
+        m_pseudoType = PseudoLastChild;
+    else if (m_value == lastOfType)
+        m_pseudoType = PseudoLastOfType;
     else if (m_value == firstLetter) {
         m_pseudoType = PseudoFirstLetter;

trunk/WebCore/css/CSSSelector.h

@@ -122 +122 @@
             PseudoFirstChild,
             PseudoFirstOfType,
+            PseudoLastChild,
+            PseudoLastOfType,
             PseudoFirstLine,
             PseudoFirstLetter,
@@ -182 +184 @@
         unsigned m_relation           : 3; // enum Relation
         mutable unsigned m_match      : 4; // enum Match
-        mutable unsigned m_pseudoType : 6; // PseudoType
+        mutable unsigned m_pseudoType : 8; // PseudoType
 
     private:

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1633 +1633 @@
                             break;
                         n = n->previousSibling();
+                    }
+                    if (!n)
+                        result = true;
+                    if (!m_collectRulesOnly) {
+                        RenderStyle* parentStyle = (m_element == e) ? m_parentStyle : e->parentNode()->renderStyle();
+                        if (parentStyle)
+                            parentStyle->setChildrenAffectedByPositionalRules();
+                    }
+                    return result;
+                }
+                break;
+            }
+            case CSSSelector::PseudoLastChild: {
+                // first-child matches the first child that is an element
+                if (e->parentNode() && e->parentNode()->isElementNode()) {
+                    bool result = false;
+                    Node* n = e->nextSibling();
+                    while (n && !n->isElementNode())
+                        n = n->nextSibling();
+                    if (!n)
+                        result = true;
+                    if (!m_collectRulesOnly) {
+                        RenderStyle* childStyle = (m_element == e) ? m_style : e->renderStyle();
+                        RenderStyle* parentStyle = (m_element == e) ? m_parentStyle : e->parentNode()->renderStyle();
+                        if (parentStyle)
+                            parentStyle->setChildrenAffectedByLastChildRules();
+                        if (result && childStyle)
+                            childStyle->setLastChildState();
+                    }
+                    return result;
+                }
+                break;
+            }
+            case CSSSelector::PseudoLastOfType: {
+                // first-of-type matches the first element of its type
+                if (e->parentNode() && e->parentNode()->isElementNode()) {
+                    bool result = false;
+                    const QualifiedName& type = e->tagQName();
+                    Node* n = e->nextSibling();
+                    while (n) {
+                        if (n->isElementNode() && static_cast<Element*>(n)->hasTagName(type))
+                            break;
+                        n = n->nextSibling();
                     }
                     if (!n)