Changeset 109285 in webkit

Timestamp:

Feb 29, 2012 5:03:41 PM (12 years ago)

Author:

kling@webkit.org

Message:

IsSynchronizingStyleAttributeFlag could be purged.
<​http://webkit.org/b/79313>

Reviewed by Anders Carlsson.

We were using IsSynchronizingStyleAttributeFlag to prevent various things from
happening below setAttribute() when serializing the "style" attribute based on
an element's inline style.

Simplify the whole thing by adding a way to set an attribute without triggering
any callbacks (a 'notifyChanged' argument to Element::setAttribute().)
This removes the need for IsSynchronizingStyleAttributeFlag in the first place
and makes StyledElement::updateStyleAttribute() a bit cheaper to boot.

• dom/Element.cpp:

(WebCore::Element::setAttribute):
(WebCore::Element::setAttributeInternal):
(WebCore::Element::willModifyAttribute):
(WebCore::Element::didModifyAttribute):
(WebCore::Element::didRemoveAttribute):

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

(WebCore::StyledElement::updateStyleAttribute):
(WebCore::StyledElement::attributeChanged):

• html/HTMLElement.cpp:

(WebCore::StyledElement::copyNonAttributeProperties):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (6 diffs)
• dom/Element.h (modified) (2 diffs)
• dom/Node.h (modified) (3 diffs)
• dom/StyledElement.cpp (modified) (2 diffs)
• html/HTMLElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  Andreas Kling  <awesomekling@apple.com>
+
+        IsSynchronizingStyleAttributeFlag could be purged.
+        <http://webkit.org/b/79313>
+
+        Reviewed by Anders Carlsson.
+
+        We were using IsSynchronizingStyleAttributeFlag to prevent various things from
+        happening below setAttribute() when serializing the "style" attribute based on
+        an element's inline style.
+
+        Simplify the whole thing by adding a way to set an attribute without triggering
+        any callbacks (a 'notifyChanged' argument to Element::setAttribute().)
+        This removes the need for IsSynchronizingStyleAttributeFlag in the first place
+        and makes StyledElement::updateStyleAttribute() a bit cheaper to boot.
+
+        * dom/Element.cpp:
+        (WebCore::Element::setAttribute):
+        (WebCore::Element::setAttributeInternal):
+        (WebCore::Element::willModifyAttribute):
+        (WebCore::Element::didModifyAttribute):
+        (WebCore::Element::didRemoveAttribute):
+        * dom/Element.h:
+        * dom/Node.h:
+        * dom/StyledElement.cpp:
+        (WebCore::StyledElement::updateStyleAttribute):
+        (WebCore::StyledElement::attributeChanged):
+        * html/HTMLElement.cpp:
+        (WebCore::StyledElement::copyNonAttributeProperties):
+
 2012-02-29  Daniel Cheng  <dcheng@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -625 +625 @@
 }
 
-void Element::setAttribute(const QualifiedName& name, const AtomicString& value)
-{
-    setAttributeInternal(ensureUpdatedAttributeData()->getAttributeItemIndex(name), name, value);
-}
-
-inline void Element::setAttributeInternal(size_t index, const QualifiedName& name, const AtomicString& value)
+void Element::setAttribute(const QualifiedName& name, const AtomicString& value, bool notifyChanged)
+{
+    setAttributeInternal(ensureUpdatedAttributeData()->getAttributeItemIndex(name), name, value, notifyChanged);
+}
+
+inline void Element::setAttributeInternal(size_t index, const QualifiedName& name, const AtomicString& value, bool notifyChanged)
 {
     ElementAttributeData* attributeData = &m_attributeMap->m_attributeData;
@@ -645 +645 @@
     }
 
-    willModifyAttribute(name, old ? old->value() : nullAtom, value);
+    if (notifyChanged)
+        willModifyAttribute(name, old ? old->value() : nullAtom, value);
 
     if (Attr* attrNode = old->attr())
@@ -652 +653 @@
         old->setValue(value);
 
-    didModifyAttribute(old);
+    if (notifyChanged)
+        didModifyAttribute(old);
 }
 
@@ -1940 +1942 @@
 
 #if ENABLE(MUTATION_OBSERVERS)
-    if (!isSynchronizingStyleAttribute()) {
-        if (OwnPtr<MutationObserverInterestGroup> recipients = MutationObserverInterestGroup::createForAttributesMutation(this, name))
-            recipients->enqueueMutationRecord(MutationRecord::createAttributes(this, name, oldValue));
-    }
+    if (OwnPtr<MutationObserverInterestGroup> recipients = MutationObserverInterestGroup::createForAttributesMutation(this, name))
+        recipients->enqueueMutationRecord(MutationRecord::createAttributes(this, name, oldValue));
 #endif
 
 #if ENABLE(INSPECTOR)
-    if (!isSynchronizingStyleAttribute())
-        InspectorInstrumentation::willModifyDOMAttr(document(), this, oldValue, newValue);
+    InspectorInstrumentation::willModifyDOMAttr(document(), this, oldValue, newValue);
 #endif
 }
@@ -1956 +1955 @@
     attributeChanged(attr);
 
-    if (!isSynchronizingStyleAttribute()) {
-        InspectorInstrumentation::didModifyDOMAttr(document(), this, attr->name().localName(), attr->value());
-        dispatchSubtreeModifiedEvent();
-    }
+    InspectorInstrumentation::didModifyDOMAttr(document(), this, attr->name().localName(), attr->value());
+    dispatchSubtreeModifiedEvent();
 }
 
@@ -1972 +1969 @@
     attr->setValue(savedValue);
 
-    if (!isSynchronizingStyleAttribute()) {
-        InspectorInstrumentation::didRemoveDOMAttr(document(), this, attr->name().localName());
-        dispatchSubtreeModifiedEvent();
-    }
+    InspectorInstrumentation::didRemoveDOMAttr(document(), this, attr->name().localName());
+    dispatchSubtreeModifiedEvent();
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -114 +114 @@
     bool hasAttribute(const QualifiedName&) const;
     const AtomicString& getAttribute(const QualifiedName&) const;
-    void setAttribute(const QualifiedName&, const AtomicString& value);
+    void setAttribute(const QualifiedName&, const AtomicString& value, bool notifyChanged = true);
     void removeAttribute(const QualifiedName&);
 
@@ -430 +430 @@
     virtual bool childTypeAllowed(NodeType) const;
 
-    void setAttributeInternal(size_t index, const QualifiedName&, const AtomicString& value);
+    void setAttributeInternal(size_t index, const QualifiedName&, const AtomicString& value, bool notifyChanged = true);
 
 #ifndef NDEBUG

trunk/Source/WebCore/dom/Node.h

@@ -89 +89 @@
 typedef int ExceptionCode;
 
-const int nodeStyleChangeShift = 23;
+const int nodeStyleChangeShift = 22;
 
 // SyntheticStyleChange means that we need to go through the entire style change logic even though
@@ -655 +655 @@
         IsParsingChildrenFinishedFlag = 1 << 17, // Element
         IsStyleAttributeValidFlag = 1 << 18, // StyledElement
-        IsSynchronizingStyleAttributeFlag = 1 << 19, // StyledElement
 #if ENABLE(SVG)
-        AreSVGAttributesValidFlag = 1 << 20, // Element
-        IsSynchronizingSVGAttributesFlag = 1 << 21, // SVGElement
-        HasSVGRareDataFlag = 1 << 22, // SVGElement
+        AreSVGAttributesValidFlag = 1 << 19, // Element
+        IsSynchronizingSVGAttributesFlag = 1 << 20, // SVGElement
+        HasSVGRareDataFlag = 1 << 21, // SVGElement
 #endif
 
         StyleChangeMask = 1 << nodeStyleChangeShift | 1 << (nodeStyleChangeShift + 1),
 
-        SelfOrAncestorHasDirAutoFlag = 1 << 25,
-        HasCustomWillOrDidRecalcStyleFlag = 1 << 26,
-        HasCustomStyleForRendererFlag = 1 << 27,
-
-        HasNameFlag = 1 << 28,
-
-        AttributeStyleDirtyFlag = 1 << 31,
+        SelfOrAncestorHasDirAutoFlag = 1 << 24,
+        HasCustomWillOrDidRecalcStyleFlag = 1 << 25,
+        HasCustomStyleForRendererFlag = 1 << 26,
+
+        HasNameFlag = 1 << 27,
+
+        AttributeStyleDirtyFlag = 1 << 28,
 
 #if ENABLE(SVG)
@@ -776 +775 @@
     void setIsStyleAttributeValid() const { setFlag(IsStyleAttributeValidFlag); }
     void clearIsStyleAttributeValid() { clearFlag(IsStyleAttributeValidFlag); }
-    bool isSynchronizingStyleAttribute() const { return getFlag(IsSynchronizingStyleAttributeFlag); }
-    void setIsSynchronizingStyleAttribute(bool f) { setFlag(f, IsSynchronizingStyleAttributeFlag); }
-    void setIsSynchronizingStyleAttribute() const { setFlag(IsSynchronizingStyleAttributeFlag); }
-    void clearIsSynchronizingStyleAttribute() const { clearFlag(IsSynchronizingStyleAttributeFlag); }
 
 #if ENABLE(SVG)

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -51 +51 @@
     ASSERT(!isStyleAttributeValid());
     setIsStyleAttributeValid();
-    setIsSynchronizingStyleAttribute();
     if (StylePropertySet* inlineStyle = inlineStyleDecl())
-        const_cast<StyledElement*>(this)->setAttribute(styleAttr, inlineStyle->asText());
-    clearIsSynchronizingStyleAttribute();
+        const_cast<StyledElement*>(this)->setAttribute(styleAttr, inlineStyle->asText(), /*notifyChanged*/ false);
 }
 
@@ -64 +62 @@
 void StyledElement::attributeChanged(Attribute* attr)
 {
-    if (!(attr->name() == styleAttr && isSynchronizingStyleAttribute()))
-        parseAttribute(attr);
+    parseAttribute(attr);
 
     if (isPresentationAttribute(attr->name())) {

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -1115 +1115 @@
 
     setIsStyleAttributeValid(source->isStyleAttributeValid());
-    setIsSynchronizingStyleAttribute(source->isSynchronizingStyleAttribute());
-    
+
     Element::copyNonAttributeProperties(sourceElement);
 }