Changeset 109619 in webkit

Timestamp:

Mar 2, 2012 2:48:03 PM (12 years ago)

Author:

caio.oliveira@openbossa.org

Message:

Implement NamedNodeMap::setNamedItem() in terms of Element::setAttributeNode() instead of the other way round
​https://bugs.webkit.org/show_bug.cgi?id=80188

Reviewed by Ryosuke Niwa.

Using setNamedItem() in setAttributeNode() implementation made us do unnecessary
checks like whether the element existed or whether the given node was an
attribute. So now setAttributeNode() do less work.

No new tests were added, functionality should be unchanged.

• dom/Element.cpp:

(WebCore::Element::setAttributeNode):
(WebCore::Element::setAttributeNodeNS):

• dom/Element.h:

(Element):
(WebCore::Element::attributes): We got rid of ensureUpdatedAttributes(), next in
line will be updatedAttributes().

• dom/NamedNodeMap.cpp:

(WebCore::NamedNodeMap::setNamedItem):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/NamedNodeMap.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Implement NamedNodeMap::setNamedItem() in terms of Element::setAttributeNode() instead of the other way round
+        https://bugs.webkit.org/show_bug.cgi?id=80188
+
+        Reviewed by Ryosuke Niwa.
+
+        Using setNamedItem() in setAttributeNode() implementation made us do unnecessary
+        checks like whether the element existed or whether the given node was an
+        attribute. So now setAttributeNode() do less work.
+
+        No new tests were added, functionality should be unchanged.
+
+        * dom/Element.cpp:
+        (WebCore::Element::setAttributeNode):
+        (WebCore::Element::setAttributeNodeNS):
+        * dom/Element.h:
+        (Element):
+        (WebCore::Element::attributes): We got rid of ensureUpdatedAttributes(), next in
+        line will be updatedAttributes().
+        * dom/NamedNodeMap.cpp:
+        (WebCore::NamedNodeMap::setNamedItem):
+
 2012-03-02  SravanKumar Sandela  <ssandela@innominds.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1375 +1375 @@
         return 0;
     }
-    return static_pointer_cast<Attr>(ensureUpdatedAttributes()->setNamedItem(attr, ec));
+
+    ElementAttributeData* attributeData = ensureUpdatedAttributeData();
+    Attribute* attribute = attr->attr();
+    size_t index = attributeData->getAttributeItemIndex(attribute->name());
+    Attribute* oldAttribute = index != notFound ? attributeData->attributeItem(index) : 0;
+    if (oldAttribute == attribute)
+        return attr; // we know about it already
+
+    // INUSE_ATTRIBUTE_ERR: Raised if node is an Attr that is already an attribute of another Element object.
+    // The DOM user must explicitly clone Attr nodes to re-use them in other elements.
+    if (attr->ownerElement()) {
+        ec = INUSE_ATTRIBUTE_ERR;
+        return 0;
+    }
+
+    RefPtr<Attr> oldAttr;
+    if (oldAttribute) {
+        oldAttr = oldAttribute->createAttrIfNeeded(this);
+        attributeData->replaceAttribute(index, attribute, this);
+    } else
+        attributeData->addAttribute(attribute, this);
+
+    return oldAttr.release();
 }
 
 PassRefPtr<Attr> Element::setAttributeNodeNS(Attr* attr, ExceptionCode& ec)
 {
-    if (!attr) {
-        ec = TYPE_MISMATCH_ERR;
-        return 0;
-    }
-    return static_pointer_cast<Attr>(ensureUpdatedAttributes()->setNamedItem(attr, ec));
+    return setAttributeNode(attr, ec);
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -229 +229 @@
 
     // For exposing to DOM only.
-    NamedNodeMap* attributes() const { return ensureUpdatedAttributes(); }
-
-    NamedNodeMap* ensureUpdatedAttributes() const;
+    NamedNodeMap* attributes() const;
+
     NamedNodeMap* updatedAttributes() const;
 
@@ -531 +530 @@
 }
 
-inline NamedNodeMap* Element::ensureUpdatedAttributes() const
+inline NamedNodeMap* Element::attributes() const
 {
     updateInvalidAttributes();

trunk/Source/WebCore/dom/NamedNodeMap.cpp

@@ -104 +104 @@
         return 0;
     }
-    Attr* attr = static_cast<Attr*>(node);
 
-    Attribute* attribute = attr->attr();
-    size_t index = m_attributeData.getAttributeItemIndex(attribute->name());
-    Attribute* oldAttribute = index != notFound ? m_attributeData.attributeItem(index) : 0;
-    if (oldAttribute == attribute)
-        return node; // we know about it already
-
-    // INUSE_ATTRIBUTE_ERR: Raised if node is an Attr that is already an attribute of another Element object.
-    // The DOM user must explicitly clone Attr nodes to re-use them in other elements.
-    if (attr->ownerElement()) {
-        ec = INUSE_ATTRIBUTE_ERR;
-        return 0;
-    }
-
-    RefPtr<Attr> oldAttr;
-    if (oldAttribute) {
-        oldAttr = oldAttribute->createAttrIfNeeded(m_element);
-        m_attributeData.replaceAttribute(index, attribute, m_element);
-    } else
-        m_attributeData.addAttribute(attribute, m_element);
-
-    return oldAttr.release();
+    return m_element->setAttributeNode(static_cast<Attr*>(node), ec);
 }