Merge 68096

WebCore/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 545 matching lines @@
     // with a non-null namespace, because it will return true if the local name happens to match
     // but the namespace does not.
     if (localName == document()->idAttributeName().localName())
         updateId(old ? old->value() : nullAtom, value);
 
     if (old && value.isNull())
         m_attributeMap->removeAttribute(old->name());
     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);
     }
 
 #if ENABLE(INSPECTOR)
     if (!isSynchronizingStyleAttribute())
         InspectorController::didModifyDOMAttr(this);
 #endif
 }
 
 void Element::setAttribute(const QualifiedName& name, const AtomicString& value, ExceptionCode&)
 {
 #if ENABLE(INSPECTOR)
     if (!isSynchronizingStyleAttribute())
         InspectorController::willModifyDOMAttr(this);
 #endif
 
     document()->incDOMTreeVersion();
 
     // Allocate attribute map if necessary.
     Attribute* old = attributes(false)->getAttributeItem(name);
 
     if (isIdAttributeName(name))
         updateId(old ? old->value() : nullAtom, value);
 
     if (old && value.isNull())
         m_attributeMap->removeAttribute(name);
     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);
     }
 
 #if ENABLE(INSPECTOR)
     if (!isSynchronizingStyleAttribute())
         InspectorController::didModifyDOMAttr(this);
 #endif
 }
 
 PassRefPtr<Attribute> Element::createAttribute(const QualifiedName& name, const AtomicString& value)
@@ skipping 1012 matching lines @@
 #endif
     
 #if ENABLE(FULLSCREEN_API)
 void Element::webkitRequestFullScreen(unsigned short flags)
 {
     document()->webkitRequestFullScreenForElement(this, flags);
 }
 #endif    
 
 } // namespace WebCore