Changeset 89989 in webkit

Timestamp:

Jun 28, 2011 11:05:16 PM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-06-28 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Kent Tamura.

Store shadowPseudoId in ElementRareData.
​https://bugs.webkit.org/show_bug.cgi?id=63604

No new tests, because the code isn't yet used.

• css/CSSSelector.cpp: (WebCore::CSSSelector::isUnknownPseudoType): Added convenience helper.
• css/CSSSelector.h: Added decl.
• dom/Element.cpp: (WebCore::Element::shadowPseudoId): Changed to use ElementRareData. (WebCore::Element::setShadowPseudoId): Ditto.
• dom/Element.h: Added decls.
• dom/ElementRareData.h: Added a member to keep shadowPseudoId.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSSelector.cpp (modified) (1 diff)
• css/CSSSelector.h (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/ElementRareData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-28  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        Store shadowPseudoId in ElementRareData.
+        https://bugs.webkit.org/show_bug.cgi?id=63604
+
+        No new tests, because the code isn't yet used.
+
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::isUnknownPseudoType): Added convenience helper.
+        * css/CSSSelector.h: Added decl.
+        * dom/Element.cpp:
+        (WebCore::Element::shadowPseudoId): Changed to use ElementRareData.
+        (WebCore::Element::setShadowPseudoId): Ditto.
+        * dom/Element.h: Added decls.
+        * dom/ElementRareData.h: Added a member to keep shadowPseudoId.
+
 2011-06-28  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/css/CSSSelector.cpp

@@ -393 +393 @@
 }
 
+bool CSSSelector::isUnknownPseudoType(const AtomicString& name)
+{
+    return parsePseudoType(name) == PseudoUnknown;
+}
+
 void CSSSelector::extractPseudoType() const
 {

trunk/Source/WebCore/css/CSSSelector.h

@@ -214 +214 @@
 
         static PseudoType parsePseudoType(const AtomicString&);
+        static bool isUnknownPseudoType(const AtomicString&);
         static PseudoId pseudoId(PseudoType);
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1235 +1235 @@
 }
 
+const AtomicString& Element::shadowPseudoId() const
+{
+    return hasRareData() ? rareData()->m_shadowPseudoId : nullAtom;
+}
+
+void Element::setShadowPseudoId(const AtomicString& id, ExceptionCode& ec)
+{
+    if (!hasRareData() && id == nullAtom)
+        return;
+
+    if (!CSSSelector::isUnknownPseudoType(id)) {
+        ec = SYNTAX_ERR;
+        return;
+    }
+
+    ensureRareData()->m_shadowPseudoId = id;
+}
+
 bool Element::childTypeAllowed(NodeType type) const
 {

trunk/Source/WebCore/dom/Element.h

@@ -236 +236 @@
 
     virtual const AtomicString& shadowPseudoId() const;
+    void setShadowPseudoId(const AtomicString&, ExceptionCode&);
 
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
@@ -543 +544 @@
 }
 
-inline const AtomicString& Element::shadowPseudoId() const
-{
-    return nullAtom;
-}
-    
 inline Element* firstElementChild(const ContainerNode* container)
 {

trunk/Source/WebCore/dom/ElementRareData.h

@@ -46 +46 @@
     RefPtr<RenderStyle> m_computedStyle;
     ShadowRoot* m_shadowRoot;
+    AtomicString m_shadowPseudoId;
 
     OwnPtr<DatasetDOMStringMap> m_datasetDOMStringMap;