[webkit-changes] [111933] branches/chromium/1025/Source/WebCore/dom

[rniwa]

Title: [111933] branches/chromium/1025/Source/WebCore/dom

Revision

111933

Author

rn...@webkit.org

Date

2012-03-23 17:09:53 -0700 (Fri, 23 Mar 2012)

Log Message

Merge r110925 into 1025 branch.

Modified Paths

branches/chromium/1025/Source/WebCore/dom/Element.cpp
branches/chromium/1025/Source/WebCore/dom/Element.h
branches/chromium/1025/Source/WebCore/dom/NamedNodeMap.cpp

Diff

Modified: branches/chromium/1025/Source/WebCore/dom/Element.cpp (111932 => 111933)

--- branches/chromium/1025/Source/WebCore/dom/Element.cpp	2012-03-24 00:01:36 UTC (rev 111932)
+++ branches/chromium/1025/Source/WebCore/dom/Element.cpp	2012-03-24 00:09:53 UTC (rev 111933)
@@ -2013,7 +2013,7 @@
 #endif
 }
 
-void Element::didModifyAttribute(Attribute* attr)
+void Element::didAddAttribute(Attribute* attr)
 {
     attributeChanged(attr);
 
@@ -2023,6 +2023,14 @@
     }
 }
 
+void Element::didModifyAttribute(Attribute* attr)
+{
+    attributeChanged(attr);
+
+    if (!isSynchronizingStyleAttribute())
+        InspectorInstrumentation::didModifyDOMAttr(document(), this, attr->name().localName(), attr->value());
+}
+
 void Element::didRemoveAttribute(Attribute* attr)
 {
     if (attr->isNull())

Modified: branches/chromium/1025/Source/WebCore/dom/Element.h (111932 => 111933)

--- branches/chromium/1025/Source/WebCore/dom/Element.h	2012-03-24 00:01:36 UTC (rev 111932)
+++ branches/chromium/1025/Source/WebCore/dom/Element.h	2012-03-24 00:09:53 UTC (rev 111933)
@@ -272,6 +272,7 @@
 
     void willModifyAttribute(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue);
     void willRemoveAttribute(const QualifiedName&, const AtomicString& value);
+    void didAddAttribute(Attribute*);
     void didModifyAttribute(Attribute*);
     void didRemoveAttribute(Attribute*);
 

Modified: branches/chromium/1025/Source/WebCore/dom/NamedNodeMap.cpp (111932 => 111933)

--- branches/chromium/1025/Source/WebCore/dom/NamedNodeMap.cpp	2012-03-24 00:01:36 UTC (rev 111932)
+++ branches/chromium/1025/Source/WebCore/dom/NamedNodeMap.cpp	2012-03-24 00:09:53 UTC (rev 111933)
@@ -261,7 +261,7 @@
         attr->m_element = m_element;
 
     if (m_element)
-        m_element->didModifyAttribute(attribute.get());
+        m_element->didAddAttribute(attribute.get());
 }
 
 void NamedNodeMap::removeAttribute(size_t index)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes