Changeset 29944 in webkit

Timestamp:

Feb 2, 2008 6:28:46 PM (16 years ago)

Author:

hyatt@apple.com

Message:

WebCore:

Fix for bug 5468, support CSS3 :only-child and :only-of-type selectors.

Reviewed by olliej

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

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

LayoutTests:

Add test for bug 5468, supporting :only-child and :only-of-type in CSS3.

Reviewed by olliej

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-02  David Hyatt  <hyatt@apple.com>
+
+        Add test for bug 5468, supporting :only-child and :only-of-type in CSS3.
+
+        Reviewed by olliej
+
+        * platform/mac/fast/css/only-child-pseudo-class-expected.checksum: Added.
+        * platform/mac/fast/css/only-child-pseudo-class-expected.png: Added.
+        * platform/mac/fast/css/only-child-pseudo-class-expected.txt: Added.
+        * platform/mac/fast/css/only-of-type-pseudo-class-expected.checksum: Added.
+        * platform/mac/fast/css/only-of-type-pseudo-class-expected.png: Added.
+        * platform/mac/fast/css/only-of-type-pseudo-class-expected.txt: Added.
+
 2008-02-02  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-02  David Hyatt  <hyatt@apple.com>
+
+        Fix for bug 5468, support CSS3 :only-child and :only-of-type selectors.
+
+        Reviewed by olliej
+
+        Added fast/css/only-child-pseudo-class.html, fast/css/only-of-type-pseudo-class.html
+
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::extractPseudoType):
+        * css/CSSSelector.h:
+        (WebCore::CSSSelector::):
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::checkOneSelector):
+
 2008-02-02  Darin Adler  <darin@apple.com>
 

trunk/WebCore/css/CSSSelector.cpp

@@ -101 +101 @@
     static AtomicString mediaControlsFullscreenButton("-webkit-media-controls-fullscreen-button");
     static AtomicString notStr("not(");
+    static AtomicString onlyChild("only-child");
+    static AtomicString onlyOfType("only-of-type");
     static AtomicString root("root");
     static AtomicString searchCancelButton("-webkit-search-cancel-button");
@@ -148 +150 @@
     else if (m_value == lastOfType)
         m_pseudoType = PseudoLastOfType;
+    else if (m_value == onlyChild)
+        m_pseudoType = PseudoOnlyChild;
+    else if (m_value == onlyOfType)
+        m_pseudoType = PseudoOnlyOfType;
     else if (m_value == firstLetter) {
         m_pseudoType = PseudoFirstLetter;

trunk/WebCore/css/CSSSelector.h

@@ -124 +124 @@
             PseudoLastChild,
             PseudoLastOfType,
+            PseudoOnlyChild,
+            PseudoOnlyOfType,
             PseudoFirstLine,
             PseudoFirstLetter,

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -1646 +1646 @@
             }
             case CSSSelector::PseudoLastChild: {
-                // first-child matches the first child that is an element
+                // last-child matches the last child that is an element
                 if (e->parentNode() && e->parentNode()->isElementNode()) {
                     bool result = false;
@@ -1667 +1667 @@
             }
             case CSSSelector::PseudoLastOfType: {
-                // first-of-type matches the first element of its type
+                // last-of-type matches the last element of its type
                 if (e->parentNode() && e->parentNode()->isElementNode()) {
                     bool result = false;
@@ -1685 +1685 @@
                     }
                     return result;
+                }
+                break;
+            }
+            case CSSSelector::PseudoOnlyChild: {
+                if (e->parentNode() && e->parentNode()->isElementNode()) {
+                    bool firstChild = false;
+                    bool lastChild = false;
+                    
+                    Node* n = e->previousSibling();
+                    while (n && !n->isElementNode())
+                        n = n->previousSibling();
+                    if (!n)
+                        firstChild = true;
+                    if (firstChild) {
+                        n = e->nextSibling();
+                        while (n && !n->isElementNode())
+                            n = n->nextSibling();
+                        if (!n)
+                            lastChild = 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->setChildrenAffectedByFirstChildRules();
+                            parentStyle->setChildrenAffectedByLastChildRules();
+                        }
+                        if (firstChild && childStyle)
+                            childStyle->setFirstChildState();
+                        if (lastChild && childStyle)
+                            childStyle->setLastChildState();
+                    }
+                    return firstChild && lastChild;
+                }
+                break;
+            }
+            case CSSSelector::PseudoOnlyOfType: {
+                if (e->parentNode() && e->parentNode()->isElementNode()) {
+                    bool firstChild = false;
+                    bool lastChild = false;
+                    const QualifiedName& type = e->tagQName();
+                    Node* n = e->previousSibling();
+                    while (n) {
+                        if (n->isElementNode() && static_cast<Element*>(n)->hasTagName(type))
+                            break;
+                        n = n->previousSibling();
+                    }
+                    if (!n)
+                        firstChild = true;
+                    if (firstChild) {
+                        n = e->nextSibling();
+                        while (n) {
+                            if (n->isElementNode() && static_cast<Element*>(n)->hasTagName(type))
+                                break;
+                            n = n->nextSibling();
+                        }
+                        if (!n)
+                            lastChild = true;
+                    }
+                    if (!m_collectRulesOnly) {
+                        RenderStyle* parentStyle = (m_element == e) ? m_parentStyle : e->parentNode()->renderStyle();
+                        if (parentStyle)
+                            parentStyle->setChildrenAffectedByPositionalRules();
+                    }
+                    return firstChild && lastChild;
                 }
                 break;