Changeset 142827 in webkit

Timestamp:

Feb 13, 2013 5:11:12 PM (11 years ago)

Author:

akling@apple.com

Message:

Remove Element::getAttributeItem() overload that returned a mutable Attribute*.
<​http://webkit.org/b/109756>

Reviewed by Antti Koivisto.

Remove this to prevent callers from accidentally causing elements to convert to UniqueElementData.
There are two call sites (Attr and HTMLSelectElement) that legitimately need to mutate Attribute
objects in-place, they now use Element::ensureUniqueElementData()->getAttributeItem() directly instead.

Small progression on Membuster3, mostly for peace of mind.

• dom/Attr.cpp:

(WebCore::Attr::elementAttribute):

• dom/Element.h:

(Element):

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::updateType):

• html/HTMLSelectElement.cpp:

(WebCore::HTMLSelectElement::parseAttribute):

• svg/SVGStyledElement.cpp:

(WebCore::SVGStyledElement::getPresentationAttribute):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Attr.cpp (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• html/HTMLInputElement.cpp (modified) (1 diff)
• html/HTMLSelectElement.cpp (modified) (1 diff)
• svg/SVGStyledElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-13  Andreas Kling  <akling@apple.com>
+
+        Remove Element::getAttributeItem() overload that returned a mutable Attribute*.
+        <http://webkit.org/b/109756>
+
+        Reviewed by Antti Koivisto.
+
+        Remove this to prevent callers from accidentally causing elements to convert to UniqueElementData.
+        There are two call sites (Attr and HTMLSelectElement) that legitimately need to mutate Attribute
+        objects in-place, they now use Element::ensureUniqueElementData()->getAttributeItem() directly instead.
+
+        Small progression on Membuster3, mostly for peace of mind.
+
+        * dom/Attr.cpp:
+        (WebCore::Attr::elementAttribute):
+        * dom/Element.h:
+        (Element):
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::updateType):
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::parseAttribute):
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::getPresentationAttribute):
+
 2013-02-13  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Attr.cpp

@@ -212 +212 @@
     ASSERT(m_element);
     ASSERT(m_element->elementData());
-    return *m_element->getAttributeItem(qualifiedName());
+    return *m_element->ensureUniqueElementData()->getAttributeItem(qualifiedName());
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -286 +286 @@
     const Attribute* attributeItem(unsigned index) const;
     const Attribute* getAttributeItem(const QualifiedName&) const;
-    Attribute* getAttributeItem(const QualifiedName&);
     size_t getAttributeItemIndex(const QualifiedName& name) const { return elementData()->getAttributeItemIndex(name); }
     size_t getAttributeItemIndex(const AtomicString& name, bool shouldIgnoreAttributeCase) const { return elementData()->getAttributeItemIndex(name, shouldIgnoreAttributeCase); }
@@ -905 +904 @@
 }
 
-inline Attribute* Element::getAttributeItem(const QualifiedName& name)
-{
-    ASSERT(elementData());
-    return ensureUniqueElementData()->getAttributeItem(name);
-}
-
 inline void Element::updateInvalidAttributes() const
 {

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -517 +517 @@
     if (didRespectHeightAndWidth != m_inputType->shouldRespectHeightAndWidthAttributes()) {
         ASSERT(elementData());
-        if (Attribute* height = getAttributeItem(heightAttr))
+        if (const Attribute* height = getAttributeItem(heightAttr))
             attributeChanged(heightAttr, height->value());
-        if (Attribute* width = getAttributeItem(widthAttr))
+        if (const Attribute* width = getAttributeItem(widthAttr))
             attributeChanged(widthAttr, width->value());
-        if (Attribute* align = getAttributeItem(alignAttr))
+        if (const Attribute* align = getAttributeItem(alignAttr))
             attributeChanged(alignAttr, align->value());
     }

trunk/Source/WebCore/html/HTMLSelectElement.cpp

@@ -292 +292 @@
         if (attrSize != value) {
             // FIXME: This is horribly factored.
-            if (Attribute* sizeAttribute = getAttributeItem(sizeAttr))
+            if (Attribute* sizeAttribute = ensureUniqueElementData()->getAttributeItem(sizeAttr))
                 sizeAttribute->setValue(attrSize);
         }

trunk/Source/WebCore/svg/SVGStyledElement.cpp

@@ -401 +401 @@
 
     QualifiedName attributeName(nullAtom, name, nullAtom);
-    Attribute* attr = getAttributeItem(attributeName);
+    const Attribute* attr = getAttributeItem(attributeName);
     if (!attr)
         return 0;