Changeset 142714 in webkit

Timestamp:

Feb 12, 2013 8:27:41 PM (11 years ago)

Author:

akling@apple.com

Message:

Remove Element::ensureAttributeData().
<​http://webkit.org/b/109643>

Reviewed by Anders Carlsson.

• dom/Element.h:
• dom/Element.cpp:

(WebCore::Element::classAttributeChanged):
(WebCore::Element::shouldInvalidateDistributionWhenAttributeChanged):

Use attributeData() instead of ensureAttributeData(), it's already guaranteed to exist in
both these functions as they are called in response to attribute changes.

• svg/SVGElement.h:

(WebCore::SVGElement::invalidateSVGAttributes):

Use mutableAttributeData() instead of ensureAttributeData() when invalidating animated
SVG attributes. While I can't find any bugs caused by this, an element with property animations
shouldn't share attribute data with other elements.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Andreas Kling  <akling@apple.com>
+
+        Remove Element::ensureAttributeData().
+        <http://webkit.org/b/109643>
+
+        Reviewed by Anders Carlsson.
+
+        * dom/Element.h:
+        * dom/Element.cpp:
+        (WebCore::Element::classAttributeChanged):
+        (WebCore::Element::shouldInvalidateDistributionWhenAttributeChanged):
+
+            Use attributeData() instead of ensureAttributeData(), it's already guaranteed to exist in
+            both these functions as they are called in response to attribute changes.
+
+        * svg/SVGElement.h:
+        (WebCore::SVGElement::invalidateSVGAttributes):
+
+            Use mutableAttributeData() instead of ensureAttributeData() when invalidating animated
+            SVG attributes. While I can't find any bugs caused by this, an element with property animations
+            shouldn't share attribute data with other elements.
+
 2013-02-12  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -922 +922 @@
 
     if (classStringHasClassName(newClassString)) {
-        const ElementAttributeData* attributeData = ensureAttributeData();
         const bool shouldFoldCase = document()->inQuirksMode();
-        const SpaceSplitString oldClasses = attributeData->classNames();
-
-        attributeData->setClass(newClassString, shouldFoldCase);
-
-        const SpaceSplitString& newClasses = attributeData->classNames();
+        const SpaceSplitString oldClasses = attributeData()->classNames();
+        attributeData()->setClass(newClassString, shouldFoldCase);
+        const SpaceSplitString& newClasses = attributeData()->classNames();
         shouldInvalidateStyle = testShouldInvalidateStyle && checkSelectorForClassChange(oldClasses, newClasses, *styleResolver);
-    } else if (const ElementAttributeData* attributeData = this->attributeData()) {
-        const SpaceSplitString& oldClasses = attributeData->classNames();
+    } else {
+        const SpaceSplitString& oldClasses = attributeData()->classNames();
         shouldInvalidateStyle = testShouldInvalidateStyle && checkSelectorForClassChange(oldClasses, *styleResolver);
-
-        attributeData->clearClass();
+        attributeData()->clearClass();
     }
 
@@ -963 +959 @@
         const AtomicString& newClassString = newValue;
         if (classStringHasClassName(newClassString)) {
-            const ElementAttributeData* attributeData = ensureAttributeData();
             const bool shouldFoldCase = document()->inQuirksMode();
-            const SpaceSplitString& oldClasses = attributeData->classNames();
+            const SpaceSplitString& oldClasses = attributeData()->classNames();
             const SpaceSplitString newClasses(newClassString, shouldFoldCase);
             if (checkSelectorForClassChange(oldClasses, newClasses, featureSet))
                 return true;
-        } else if (const ElementAttributeData* attributeData = this->attributeData()) {
-            const SpaceSplitString& oldClasses = attributeData->classNames();
+        } else {
+            const SpaceSplitString& oldClasses = attributeData()->classNames();
             if (checkSelectorForClassChange(oldClasses, featureSet))
                 return true;

trunk/Source/WebCore/dom/Element.h

@@ -374 +374 @@
     const ElementAttributeData* attributeData() const { return m_attributeData.get(); }
     ElementAttributeData* mutableAttributeData();
-    const ElementAttributeData* ensureAttributeData();
     const ElementAttributeData* updatedAttributeData() const;
     const ElementAttributeData* ensureUpdatedAttributeData() const;
@@ -785 +784 @@
 }
 
-inline const ElementAttributeData* Element::ensureAttributeData()
-{
-    if (attributeData())
-        return attributeData();
-    return mutableAttributeData();
-}
-
 inline const ElementAttributeData* Element::ensureUpdatedAttributeData() const
 {

trunk/Source/WebCore/svg/SVGElement.h

@@ -80 +80 @@
     virtual AffineTransform* supplementalTransform() { return 0; }
 
-    void invalidateSVGAttributes() { ensureAttributeData()->m_animatedSVGAttributesAreDirty = true; }
+    void invalidateSVGAttributes() { mutableAttributeData()->m_animatedSVGAttributesAreDirty = true; }
 
     const HashSet<SVGElementInstance*>& instancesForElement() const;