Merge 68096

WebCore/dom/Element.cpp

Index: WebCore/dom/Element.cpp
===================================================================
--- WebCore/dom/Element.cpp	(revision 69030)
+++ WebCore/dom/Element.cpp	(working copy)
@@ -563,7 +563,10 @@
     else if (!old && !value.isNull())
         m_attributeMap->addAttribute(createAttribute(QualifiedName(nullAtom, localName, nullAtom), value));
     else if (old && !value.isNull()) {
-        old->setValue(value);
+        if (Attr* attrNode = old->attr())
+            attrNode->setValue(value);
+        else
+            old->setValue(value);
         attributeChanged(old);
     }
 
@@ -593,7 +596,10 @@
     else if (!old && !value.isNull())
         m_attributeMap->addAttribute(createAttribute(name, value));
     else if (old) {
-        old->setValue(value);
+        if (Attr* attrNode = old->attr())
+            attrNode->setValue(value);
+        else
+            old->setValue(value);
         attributeChanged(old);
     }