Changeset 106819 in webkit

Timestamp:

Feb 6, 2012 10:35:54 AM (12 years ago)

Author:

caio.oliveira@openbossa.org

Message:

Move style related functions from NamedNodeMap to ElementAttributeData
​https://bugs.webkit.org/show_bug.cgi?id=77879

Reviewed by Ryosuke Niwa.

This commit also removes the NamedNodeMap::mappedAttributeCount(),
which is a leftover from removal of mapped attributes.

• dom/ElementAttributeData.cpp:

(WebCore::ElementAttributeData::ensureInlineStyleDecl):
(WebCore):
(WebCore::ElementAttributeData::destroyInlineStyleDecl):
(WebCore::ElementAttributeData::ensureAttributeStyle):

• dom/ElementAttributeData.h:

(WebCore::ElementAttributeData::inlineStyleDecl):
(ElementAttributeData):
(WebCore::ElementAttributeData::attributeStyle):

• dom/NamedNodeMap.cpp:
• dom/NamedNodeMap.h:
• dom/StyledElement.h:

(StyledElement):
(WebCore::StyledElement::inlineStyleDecl):
(WebCore::StyledElement::ensureInlineStyleDecl):
(WebCore::StyledElement::attributeStyle):
(WebCore::StyledElement::ensureAttributeStyle):
(WebCore::StyledElement::destroyInlineStyleDecl):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ElementAttributeData.cpp (modified) (2 diffs)
• dom/ElementAttributeData.h (modified) (1 diff)
• dom/NamedNodeMap.cpp (modified) (2 diffs)
• dom/NamedNodeMap.h (modified) (2 diffs)
• dom/StyledElement.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Move style related functions from NamedNodeMap to ElementAttributeData
+        https://bugs.webkit.org/show_bug.cgi?id=77879
+
+        Reviewed by Ryosuke Niwa.
+
+        This commit also removes the NamedNodeMap::mappedAttributeCount(),
+        which is a leftover from removal of mapped attributes.
+
+        * dom/ElementAttributeData.cpp:
+        (WebCore::ElementAttributeData::ensureInlineStyleDecl):
+        (WebCore):
+        (WebCore::ElementAttributeData::destroyInlineStyleDecl):
+        (WebCore::ElementAttributeData::ensureAttributeStyle):
+        * dom/ElementAttributeData.h:
+        (WebCore::ElementAttributeData::inlineStyleDecl):
+        (ElementAttributeData):
+        (WebCore::ElementAttributeData::attributeStyle):
+        * dom/NamedNodeMap.cpp:
+        * dom/NamedNodeMap.h:
+        * dom/StyledElement.h:
+        (StyledElement):
+        (WebCore::StyledElement::inlineStyleDecl):
+        (WebCore::StyledElement::ensureInlineStyleDecl):
+        (WebCore::StyledElement::attributeStyle):
+        (WebCore::StyledElement::ensureAttributeStyle):
+        (WebCore::StyledElement::destroyInlineStyleDecl):
+
 2012-02-06  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/dom/ElementAttributeData.cpp

@@ -27 +27 @@
 #include "ElementAttributeData.h"
 
+#include "StyledElement.h"
+
 namespace WebCore {
 
@@ -34 +36 @@
 }
 
+StylePropertySet* ElementAttributeData::ensureInlineStyleDecl(Element* element)
+{
+    if (!m_inlineStyleDecl) {
+        ASSERT(element->isStyledElement());
+        m_inlineStyleDecl = StylePropertySet::createInline(static_cast<StyledElement*>(element));
+        m_inlineStyleDecl->setStrictParsing(element->isHTMLElement() && !element->document()->inQuirksMode());
+    }
+    return m_inlineStyleDecl.get();
 }
+
+void ElementAttributeData::destroyInlineStyleDecl()
+{
+    if (!m_inlineStyleDecl)
+        return;
+    m_inlineStyleDecl->clearParentElement();
+    m_inlineStyleDecl = 0;
+}
+
+StylePropertySet* ElementAttributeData::ensureAttributeStyle()
+{
+    if (!m_attributeStyle) {
+        m_attributeStyle = StylePropertySet::create();
+        m_attributeStyle->setStrictParsing(false);
+    }
+    return m_attributeStyle.get();
+}
+
+}

trunk/Source/WebCore/dom/ElementAttributeData.h

@@ -43 +43 @@
     void setIdForStyleResolution(const AtomicString& newId) { m_idForStyleResolution = newId; }
 
+    StylePropertySet* inlineStyleDecl() { return m_inlineStyleDecl.get(); }
+    StylePropertySet* ensureInlineStyleDecl(Element*);
+    void destroyInlineStyleDecl();
+
+    StylePropertySet* attributeStyle() const { return m_attributeStyle.get(); }
+    StylePropertySet* ensureAttributeStyle();
+
 private:
     friend class NamedNodeMap;

trunk/Source/WebCore/dom/NamedNodeMap.cpp

@@ -31 +31 @@
 #include "ExceptionCode.h"
 #include "HTMLNames.h"
-#include "StyledElement.h"
 
 namespace WebCore {
@@ -319 +318 @@
 }
 
-StylePropertySet* NamedNodeMap::ensureInlineStyleDecl()
-{
-    if (!attributeData()->m_inlineStyleDecl) {
-        ASSERT(m_element->isStyledElement());
-        attributeData()->m_inlineStyleDecl = StylePropertySet::createInline(static_cast<StyledElement*>(m_element));
-        attributeData()->m_inlineStyleDecl->setStrictParsing(m_element->isHTMLElement() && !m_element->document()->inQuirksMode());
-    }
-    return attributeData()->m_inlineStyleDecl.get();
-}
-
-void NamedNodeMap::destroyInlineStyleDecl()
-{
-    if (!attributeData()->m_inlineStyleDecl)
-        return;
-    attributeData()->m_inlineStyleDecl->clearParentElement();
-    attributeData()->m_inlineStyleDecl = 0;
-}
-
-StylePropertySet* NamedNodeMap::ensureAttributeStyle()
-{
-    if (!attributeData()->m_attributeStyle) {
-        attributeData()->m_attributeStyle = StylePropertySet::create();
-        attributeData()->m_attributeStyle->setStrictParsing(false);
-    }
-    return attributeData()->m_attributeStyle.get();
-}
-
 } // namespace WebCore

trunk/Source/WebCore/dom/NamedNodeMap.h

@@ -27 +27 @@
 
 #include "Attribute.h"
-#include "CSSPropertyNames.h"
 #include "ElementAttributeData.h"
 #include "SpaceSplitString.h"
@@ -96 +95 @@
     Element* element() const { return m_element; }
 
-    size_t mappedAttributeCount() const;
-
     ElementAttributeData* attributeData() { return &m_attributeData; }
     const ElementAttributeData* attributeData() const { return &m_attributeData; }
-
-    StylePropertySet* inlineStyleDecl() { return attributeData()->m_inlineStyleDecl.get(); }
-    StylePropertySet* ensureInlineStyleDecl();
-    void destroyInlineStyleDecl();
-
-    StylePropertySet* attributeStyle() const { return attributeData()->m_attributeStyle.get(); }
-    StylePropertySet* ensureAttributeStyle();
 
 private:

trunk/Source/WebCore/dom/StyledElement.h

@@ -37 +37 @@
     virtual ~StyledElement();
 
-    size_t mappedAttributeCount() const { return attributeMap() ? attributeMap()->mappedAttributeCount() : 0; }
-
     void addCSSLength(int id, const String& value);
     void addCSSProperty(int id, const String& value);
@@ -50 +48 @@
     void invalidateStyleAttribute();
 
-    StylePropertySet* inlineStyleDecl() const { return attributeMap() ? attributeMap()->inlineStyleDecl() : 0; }
-    StylePropertySet* ensureInlineStyleDecl() { return ensureAttributeMap()->ensureInlineStyleDecl(); }
+    StylePropertySet* inlineStyleDecl() const { return attributeData() ? attributeData()->inlineStyleDecl() : 0; }
+    StylePropertySet* ensureInlineStyleDecl() { return ensureAttributeData()->ensureInlineStyleDecl(this); }
     virtual CSSStyleDeclaration* style() OVERRIDE { return ensureInlineStyleDecl()->ensureCSSStyleDeclaration(); }
 
-    StylePropertySet* attributeStyle() const { return attributeMap() ? attributeMap()->attributeStyle() : 0; }
-    StylePropertySet* ensureAttributeStyle() { return ensureAttributeMap()->ensureAttributeStyle(); }
+    StylePropertySet* attributeStyle() const { return attributeData() ? attributeData()->attributeStyle() : 0; }
+    StylePropertySet* ensureAttributeStyle() { return ensureAttributeData()->ensureAttributeStyle(); }
 
     const SpaceSplitString& classNames() const;
@@ -81 +79 @@
     void destroyInlineStyleDecl()
     {
-        if (attributeMap())
-            attributeMap()->destroyInlineStyleDecl();
+        if (attributeData())
+            attributeData()->destroyInlineStyleDecl();
     }
 };