Title: [118293] branches/chromium/1132
- Revision
- 118293
- Author
- [email protected]
- Date
- 2012-05-23 18:09:22 -0700 (Wed, 23 May 2012)
Log Message
Merge 116618
BUG=127587
Review URL: https://chromiumcodereview.appspot.com/10446008
Modified Paths
Diff
Modified: branches/chromium/1132/LayoutTests/fast/events/scoped/editing-commands.html (118292 => 118293)
--- branches/chromium/1132/LayoutTests/fast/events/scoped/editing-commands.html 2012-05-24 01:09:13 UTC (rev 118292)
+++ branches/chromium/1132/LayoutTests/fast/events/scoped/editing-commands.html 2012-05-24 01:09:22 UTC (rev 118293)
@@ -47,6 +47,7 @@
];
var events = {
+ 'DOMCharacterDataModified': false,
'DOMSubtreeModified': false,
'DOMNodeInserted': false,
'DOMNodeRemoved': false,
Modified: branches/chromium/1132/Source/WebCore/dom/CharacterData.cpp (118292 => 118293)
--- branches/chromium/1132/Source/WebCore/dom/CharacterData.cpp 2012-05-24 01:09:13 UTC (rev 118292)
+++ branches/chromium/1132/Source/WebCore/dom/CharacterData.cpp 2012-05-24 01:09:22 UTC (rev 118293)
@@ -200,7 +200,7 @@
if (parentNode())
parentNode()->childrenChanged();
if (document()->hasListenerType(Document::DOMCHARACTERDATAMODIFIED_LISTENER))
- dispatchEvent(MutationEvent::create(eventNames().DOMCharacterDataModifiedEvent, true, 0, oldData, m_data));
+ dispatchScopedEvent(MutationEvent::create(eventNames().DOMCharacterDataModifiedEvent, true, 0, oldData, m_data));
dispatchSubtreeModifiedEvent();
#if ENABLE(INSPECTOR)
InspectorInstrumentation::characterDataModified(document(), this);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
