Changeset 154991 in webkit

Timestamp:

Sep 3, 2013, 11:30:08 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r154881.
​http://trac.webkit.org/changeset/154881
​https://bugs.webkit.org/show_bug.cgi?id=120643

Crashes on macworld.com (Requested by kling on #webkit).

Source/WebCore:

• dom/Element.cpp:

(WebCore::Element::setAttributeInternal):

LayoutTests:

• fast/dom/Element/setAttributeNode-for-existing-attribute-expected.txt: Removed.
• fast/dom/Element/setAttributeNode-for-existing-attribute.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Element/setAttributeNode-for-existing-attribute-expected.txt (deleted)
• LayoutTests/fast/dom/Element/setAttributeNode-for-existing-attribute.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154881.
+        http://trac.webkit.org/changeset/154881
+        https://bugs.webkit.org/show_bug.cgi?id=120643
+
+        Crashes on macworld.com (Requested by kling on #webkit).
+
+        * fast/dom/Element/setAttributeNode-for-existing-attribute-expected.txt: Removed.
+        * fast/dom/Element/setAttributeNode-for-existing-attribute.html: Removed.
+
 2013-09-03  Mihnea Ovidenie  <mihnea@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r154881.
+        http://trac.webkit.org/changeset/154881
+        https://bugs.webkit.org/show_bug.cgi?id=120643
+
+        Crashes on macworld.com (Requested by kling on #webkit).
+
+        * dom/Element.cpp:
+        (WebCore::Element::setAttributeInternal):
+
 2013-09-03  Andre Moreira Magalhaes   <andre.magalhaes@collabora.co.uk>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -964 +964 @@
     }
 
-    bool valueChanged = newValue != attributeAt(index).value();
-    const QualifiedName& attributeName = (!inSynchronizationOfLazyAttribute || valueChanged) ? attributeAt(index).name() : name;
-
     if (!inSynchronizationOfLazyAttribute)
-        willModifyAttribute(attributeName, attributeAt(index).value(), newValue);
-
-    if (valueChanged) {
+        willModifyAttribute(name, attributeAt(index).value(), newValue);
+
+    if (newValue != attributeAt(index).value()) {
         // If there is an Attr node hooked to this attribute, the Attr::setValue() call below
         // will write into the ElementData.
         // FIXME: Refactor this so it makes some sense.
-        if (RefPtr<Attr> attrNode = inSynchronizationOfLazyAttribute ? 0 : attrIfExists(attributeName))
+        if (RefPtr<Attr> attrNode = inSynchronizationOfLazyAttribute ? 0 : attrIfExists(name))
             attrNode->setValue(newValue);
         else
@@ -981 +978 @@
 
     if (!inSynchronizationOfLazyAttribute)
-        didModifyAttribute(attributeName, newValue);
+        didModifyAttribute(name, newValue);
 }