Changeset 135816 in webkit

Timestamp:

Nov 26, 2012 9:13:40 PM (11 years ago)

Author:

akling@apple.com

Message:

Node: Move AreSVGAttributesValidFlag to ElementAttributeData.
<​http://webkit.org/b/103349>

Reviewed by Anders Carlsson.

Moved AreSVGAttributesValidFlag to ElementAttributeData and change it to use "dirty" semantics.
This frees up a bit on Node, and we will always have ElementAttributeData if the animated
attributes are dirty anyway.

• dom/Element.cpp:

(WebCore::Element::getAttribute):

• dom/Element.h:

(WebCore::Element::updateInvalidAttributes):

• dom/ElementAttributeData.cpp:

(WebCore::ElementAttributeData::ElementAttributeData):

• dom/ElementAttributeData.h:

(WebCore::ElementAttributeData::ElementAttributeData):
(ElementAttributeData):

• dom/Node.h:

(Node):

• svg/SVGElement.cpp:

(WebCore::SVGElement::updateAnimatedSVGAttribute):

• svg/SVGElement.h:

(WebCore::SVGElement::invalidateSVGAttributes):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-26  Andreas Kling  <akling@apple.com>
+
+        Node: Move AreSVGAttributesValidFlag to ElementAttributeData.
+        <http://webkit.org/b/103349>
+
+        Reviewed by Anders Carlsson.
+
+        Moved AreSVGAttributesValidFlag to ElementAttributeData and change it to use "dirty" semantics.
+        This frees up a bit on Node, and we will always have ElementAttributeData if the animated
+        attributes are dirty anyway.
+
+        * dom/Element.cpp:
+        (WebCore::Element::getAttribute):
+        * dom/Element.h:
+        (WebCore::Element::updateInvalidAttributes):
+        * dom/ElementAttributeData.cpp:
+        (WebCore::ElementAttributeData::ElementAttributeData):
+        * dom/ElementAttributeData.h:
+        (WebCore::ElementAttributeData::ElementAttributeData):
+        (ElementAttributeData):
+        * dom/Node.h:
+        (Node):
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::updateAnimatedSVGAttribute):
+        * svg/SVGElement.h:
+        (WebCore::SVGElement::invalidateSVGAttributes):
+
 2012-11-26  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -306 +306 @@
 const AtomicString& Element::getAttribute(const QualifiedName& name) const
 {
-    if (UNLIKELY(name == styleAttr) && attributeData() && attributeData()->m_styleAttributeIsDirty)
+    if (!attributeData())
+        return nullAtom;
+
+    if (UNLIKELY(name == styleAttr && attributeData()->m_styleAttributeIsDirty))
         updateStyleAttribute();
 
 #if ENABLE(SVG)
-    if (UNLIKELY(!areSVGAttributesValid()))
+    if (UNLIKELY(attributeData()->m_animatedSVGAttributesAreDirty))
         updateAnimatedSVGAttribute(name);
 #endif
 
-    if (attributeData()) {
-        if (const Attribute* attribute = getAttributeItem(name))
-            return attribute->value();
-    }
+    if (const Attribute* attribute = getAttributeItem(name))
+        return attribute->value();
     return nullAtom;
 }
@@ -661 +662 @@
 const AtomicString& Element::getAttribute(const AtomicString& name) const
 {
+    if (!attributeData())
+        return nullAtom;
+
     bool ignoreCase = shouldIgnoreAttributeCase(this);
 
     // Update the 'style' attribute if it's invalid and being requested:
-    if (attributeData() && attributeData()->m_styleAttributeIsDirty && equalPossiblyIgnoringCase(name, styleAttr.localName(), ignoreCase))
+    if (attributeData()->m_styleAttributeIsDirty && equalPossiblyIgnoringCase(name, styleAttr.localName(), ignoreCase))
         updateStyleAttribute();
 
 #if ENABLE(SVG)
-    if (!areSVGAttributesValid()) {
+    if (attributeData()->m_animatedSVGAttributesAreDirty) {
         // We're not passing a namespace argument on purpose. SVGNames::*Attr are defined w/o namespaces as well.
         updateAnimatedSVGAttribute(QualifiedName(nullAtom, name, nullAtom));
@@ -674 +678 @@
 #endif
 
-    if (attributeData()) {
-        if (const Attribute* attribute = attributeData()->getAttributeItem(name, ignoreCase))
-            return attribute->value();
-    }
-
+    if (const Attribute* attribute = attributeData()->getAttributeItem(name, ignoreCase))
+        return attribute->value();
     return nullAtom;
 }

trunk/Source/WebCore/dom/Element.h

@@ -744 +744 @@
 inline void Element::updateInvalidAttributes() const
 {
-    if (attributeData() && attributeData()->m_styleAttributeIsDirty)
+    if (!attributeData())
+        return;
+
+    if (attributeData()->m_styleAttributeIsDirty)
         updateStyleAttribute();
 
 #if ENABLE(SVG)
-    if (!areSVGAttributesValid())
+    if (attributeData()->m_animatedSVGAttributesAreDirty)
         updateAnimatedSVGAttribute(anyQName());
 #endif

trunk/Source/WebCore/dom/ElementAttributeData.cpp

@@ -87 +87 @@
     , m_presentationAttributeStyleIsDirty(other.m_presentationAttributeStyleIsDirty)
     , m_styleAttributeIsDirty(other.m_styleAttributeIsDirty)
+#if ENABLE(SVG)
+    , m_animatedSVGAttributesAreDirty(other.m_animatedSVGAttributesAreDirty)
+#endif
     , m_classNames(other.m_classNames)
     , m_idForStyleResolution(other.m_idForStyleResolution)

trunk/Source/WebCore/dom/ElementAttributeData.h

@@ -91 +91 @@
         , m_presentationAttributeStyleIsDirty(false)
         , m_styleAttributeIsDirty(false)
+#if ENABLE(SVG)
+        , m_animatedSVGAttributesAreDirty(false)
+#endif
     { }
 
@@ -98 +101 @@
         , m_presentationAttributeStyleIsDirty(false)
         , m_styleAttributeIsDirty(false)
+#if ENABLE(SVG)
+        , m_animatedSVGAttributesAreDirty(false)
+#endif
     { }
 
@@ -103 +109 @@
 
     unsigned m_isMutable : 1;
-    unsigned m_arraySize : 29;
+    unsigned m_arraySize : 28;
     mutable unsigned m_presentationAttributeStyleIsDirty : 1;
     mutable unsigned m_styleAttributeIsDirty : 1;
+#if ENABLE(SVG)
+    mutable unsigned m_animatedSVGAttributesAreDirty : 1;
+#endif
 
     mutable RefPtr<StylePropertySet> m_inlineStyle;
@@ -116 +125 @@
     friend class ImmutableElementAttributeData;
     friend class MutableElementAttributeData;
+#if ENABLE(SVG)
+    friend class SVGElement;
+#endif
 
     Attribute* getAttributeItem(const AtomicString& name, bool shouldIgnoreAttributeCase);

trunk/Source/WebCore/dom/Node.h

@@ -99 +99 @@
 typedef int ExceptionCode;
 
-const int nodeStyleChangeShift = 18;
+const int nodeStyleChangeShift = 17;
 
 // SyntheticStyleChange means that we need to go through the entire style change logic even though
@@ -706 +706 @@
         IsParsingChildrenFinishedFlag = 1 << 15, // Element
 #if ENABLE(SVG)
-        AreSVGAttributesValidFlag = 1 << 16, // Element
-        HasSVGRareDataFlag = 1 << 17, // SVGElement
+        HasSVGRareDataFlag = 1 << 16, // SVGElement
 #endif
 
         StyleChangeMask = 1 << nodeStyleChangeShift | 1 << (nodeStyleChangeShift + 1),
 
-        SelfOrAncestorHasDirAutoFlag = 1 << 20,
-
-        HasNameOrIsEditingTextFlag = 1 << 21,
-
-        InNamedFlowFlag = 1 << 22,
-        HasSyntheticAttrChildNodesFlag = 1 << 23,
-        HasCustomCallbacksFlag = 1 << 24,
-        HasScopedHTMLStyleChildFlag = 1 << 25,
-        HasEventTargetDataFlag = 1 << 26,
-        V8CollectableDuringMinorGCFlag = 1 << 27,
-        IsInsertionPointFlag = 1 << 28,
-
-#if ENABLE(SVG)
-        DefaultNodeFlags = IsParsingChildrenFinishedFlag | AreSVGAttributesValidFlag,
-#else
-        DefaultNodeFlags = IsParsingChildrenFinishedFlag,
-#endif
+        SelfOrAncestorHasDirAutoFlag = 1 << 19,
+
+        HasNameOrIsEditingTextFlag = 1 << 20,
+
+        InNamedFlowFlag = 1 << 21,
+        HasSyntheticAttrChildNodesFlag = 1 << 22,
+        HasCustomCallbacksFlag = 1 << 23,
+        HasScopedHTMLStyleChildFlag = 1 << 24,
+        HasEventTargetDataFlag = 1 << 25,
+        V8CollectableDuringMinorGCFlag = 1 << 26,
+        IsInsertionPointFlag = 1 << 27,
+
+        DefaultNodeFlags = IsParsingChildrenFinishedFlag
     };
 
-    // 3 bits remaining
+    // 4 bits remaining
 
     bool getFlag(NodeFlags mask) const { return m_nodeFlags & mask; }
@@ -840 +835 @@
 
 #if ENABLE(SVG)
-    bool areSVGAttributesValid() const { return getFlag(AreSVGAttributesValidFlag); }
-    void setAreSVGAttributesValid() const { setFlag(AreSVGAttributesValidFlag); }
-    void clearAreSVGAttributesValid() { clearFlag(AreSVGAttributesValidFlag); }
     bool hasSVGRareData() const { return getFlag(HasSVGRareDataFlag); }
     void setHasSVGRareData() { setFlag(HasSVGRareDataFlag); }

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -567 +567 @@
 void SVGElement::updateAnimatedSVGAttribute(const QualifiedName& name) const
 {
-    if (areSVGAttributesValid())
+    if (!attributeData() || !attributeData()->m_animatedSVGAttributesAreDirty)
         return;
 
@@ -573 +573 @@
     if (name == anyQName()) {
         nonConstThis->localAttributeToPropertyMap().synchronizeProperties(nonConstThis);
-        setAreSVGAttributesValid();
+        attributeData()->m_animatedSVGAttributesAreDirty = false;
     } else
         nonConstThis->localAttributeToPropertyMap().synchronizeProperty(nonConstThis, name);

trunk/Source/WebCore/svg/SVGElement.h

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