Changeset 143114 in webkit

Timestamp:

Feb 16, 2013 3:34:22 PM (11 years ago)

Author:

akling@apple.com

Message:

Element: Devirtualize attribute synchronization functions.
<​http://webkit.org/b/110033>

Reviewed by Darin Adler.

Devirtualize the functions that perform re-serialization of lazy attributes and give
them "synchronize"-style names:

• SVGElement::synchronizeAnimatedSVGAttribute()
• StyledElement::synchronizeStyleAttributeInternal()

• dom/Element.cpp:

(WebCore::Element::synchronizeAllAttributes):
(WebCore::Element::synchronizeAttribute):

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

(WebCore::StyledElement::synchronizeStyleAttribute):

• dom/StyledElement.h:

(StyledElement):

• rendering/svg/RenderSVGResourceGradient.cpp:

(WebCore::RenderSVGResourceGradient::applyResource):

• rendering/svg/RenderSVGResourcePattern.cpp:

(WebCore::RenderSVGResourcePattern::buildPattern):

• svg/SVGElement.cpp:

(WebCore::SVGElement::synchronizeAnimatedSVGAttribute):

• svg/SVGElement.h:

(SVGElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (4 diffs)
• dom/Element.h (modified) (1 diff)
• dom/StyledElement.cpp (modified) (1 diff)
• dom/StyledElement.h (modified) (2 diffs)
• rendering/svg/RenderSVGResourceGradient.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourcePattern.cpp (modified) (1 diff)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-16  Andreas Kling  <akling@apple.com>
+
+        Element: Devirtualize attribute synchronization functions.
+        <http://webkit.org/b/110033>
+
+        Reviewed by Darin Adler.
+
+        Devirtualize the functions that perform re-serialization of lazy attributes and give
+        them "synchronize"-style names:
+
+            - SVGElement::synchronizeAnimatedSVGAttribute()
+            - StyledElement::synchronizeStyleAttributeInternal()
+
+        * dom/Element.cpp:
+        (WebCore::Element::synchronizeAllAttributes):
+        (WebCore::Element::synchronizeAttribute):
+        * dom/Element.h:
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::synchronizeStyleAttribute):
+        * dom/StyledElement.h:
+        (StyledElement):
+        * rendering/svg/RenderSVGResourceGradient.cpp:
+        (WebCore::RenderSVGResourceGradient::applyResource):
+        * rendering/svg/RenderSVGResourcePattern.cpp:
+        (WebCore::RenderSVGResourcePattern::buildPattern):
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::synchronizeAnimatedSVGAttribute):
+        * svg/SVGElement.h:
+        (SVGElement):
+
 2013-02-16  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -341 +341 @@
     if (!elementData())
         return;
-    if (elementData()->m_styleAttributeIsDirty)
-        updateStyleAttribute();
+    if (elementData()->m_styleAttributeIsDirty) {
+        ASSERT(isStyledElement());
+        static_cast<const StyledElement*>(this)->synchronizeStyleAttributeInternal();
+    }
 #if ENABLE(SVG)
-    if (elementData()->m_animatedSVGAttributesAreDirty)
-        updateAnimatedSVGAttribute(anyQName());
+    if (elementData()->m_animatedSVGAttributesAreDirty) {
+        ASSERT(isSVGElement());
+        static_cast<const SVGElement*>(this)->synchronizeAnimatedSVGAttribute(anyQName());
+    }
 #endif
 }
@@ -354 +358 @@
         return;
     if (UNLIKELY(name == styleAttr && elementData()->m_styleAttributeIsDirty)) {
-        updateStyleAttribute();
+        ASSERT(isStyledElement());
+        static_cast<const StyledElement*>(this)->synchronizeStyleAttributeInternal();
         return;
     }
 #if ENABLE(SVG)
-    if (UNLIKELY(elementData()->m_animatedSVGAttributesAreDirty))
-        updateAnimatedSVGAttribute(name);
+    if (UNLIKELY(elementData()->m_animatedSVGAttributesAreDirty)) {
+        ASSERT(isSVGElement());
+        static_cast<const SVGElement*>(this)->synchronizeAnimatedSVGAttribute(name);
+    }
 #endif
 }
@@ -370 +377 @@
         return;
     if (elementData()->m_styleAttributeIsDirty && equalPossiblyIgnoringCase(localName, styleAttr.localName(), shouldIgnoreAttributeCase(this))) {
-        updateStyleAttribute();
+        ASSERT(isStyledElement());
+        static_cast<const StyledElement*>(this)->synchronizeStyleAttributeInternal();
         return;
     }
@@ -376 +384 @@
     if (elementData()->m_animatedSVGAttributesAreDirty) {
         // We're not passing a namespace argument on purpose. SVGNames::*Attr are defined w/o namespaces as well.
-        updateAnimatedSVGAttribute(QualifiedName(nullAtom, localName, nullAtom));
+        ASSERT(isSVGElement());
+        static_cast<const SVGElement*>(this)->synchronizeAnimatedSVGAttribute(QualifiedName(nullAtom, localName, nullAtom));
     }
 #endif

trunk/Source/WebCore/dom/Element.h

@@ -667 +667 @@
     bool pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderStyle* newStyle);
 
-    virtual void updateStyleAttribute() const { }
-
-#if ENABLE(SVG)
-    virtual void updateAnimatedSVGAttribute(const QualifiedName&) const { }
-#endif
-
     void cancelFocusAppearanceUpdate();
 

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -127 +127 @@
 }
 
-void StyledElement::updateStyleAttribute() const
+void StyledElement::synchronizeStyleAttributeInternal() const
 {
     ASSERT(elementData());

trunk/Source/WebCore/dom/StyledElement.h

@@ -50 +50 @@
     bool removeInlineStyleProperty(CSSPropertyID);
     void removeAllInlineStyleProperties();
+
+    void synchronizeStyleAttributeInternal() const;
     
     virtual CSSStyleDeclaration* style() OVERRIDE;
@@ -76 +78 @@
     void styleAttributeChanged(const AtomicString& newStyleString);
 
-    virtual void updateStyleAttribute() const;
     void inlineStyleChanged();
     PropertySetCSSStyleDeclaration* inlineStyleCSSOMWrapper();

trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp

@@ -128 +128 @@
 
     if (m_shouldCollectGradientAttributes) {
-        gradientElement->updateAnimatedSVGAttribute(anyQName());
+        gradientElement->synchronizeAnimatedSVGAttribute(anyQName());
         if (!collectGradientAttributes(gradientElement))
             return false;

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp

@@ -67 +67 @@
 
     if (m_shouldCollectPatternAttributes) {
-        patternElement->updateAnimatedSVGAttribute(anyQName());
+        patternElement->synchronizeAnimatedSVGAttribute(anyQName());
 
         m_attributes = PatternAttributes();

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -543 +543 @@
 }
 
-void SVGElement::updateAnimatedSVGAttribute(const QualifiedName& name) const
+void SVGElement::synchronizeAnimatedSVGAttribute(const QualifiedName& name) const
 {
     if (!elementData() || !elementData()->m_animatedSVGAttributesAreDirty)

trunk/Source/WebCore/svg/SVGElement.h

@@ -94 +94 @@
     void setCorrespondingElement(SVGElement*);
 
-    virtual void updateAnimatedSVGAttribute(const QualifiedName&) const;
+    void synchronizeAnimatedSVGAttribute(const QualifiedName&) const;
  
     virtual PassRefPtr<RenderStyle> customStyleForRenderer() OVERRIDE;