Unreviewed build fix after r150469. We need to bail out here when DOM is mutated...

the split text nodes no longer exist right next to each other.

* editing/InsertParagraphSeparatorCommand.cpp:
(WebCore::InsertParagraphSeparatorCommand::doApply):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150481 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f045a38cf6c7f231b5002d4cfa36e3d90ddd2fdb..b3e4335ec96a887d164ba1ad997da0a743d2660f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-21  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Unreviewed build fix after r150469. We need to bail out here when DOM is mutated by an event listener such that
+        the split text nodes no longer exist right next to each other.
+
+        * editing/InsertParagraphSeparatorCommand.cpp:
+        (WebCore::InsertParagraphSeparatorCommand::doApply):
+
 2013-05-21  Antti Koivisto  <antti@apple.com>
 
         Remove ScopeContentDistribution

diff --git a/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp b/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
index 64a5254baa7f3ad9d6016326ff3369accc0e5bcc..d3aaa1b2b6bd68df7ad1843fad28726eaaf5a57b 100644 (file)
--- a/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
+++ b/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
@@ -336,6 +336,8 @@ void InsertParagraphSeparatorCommand::doApply()
         if (insertionPosition.deprecatedEditingOffset() > 0 && !atEnd) {
             splitTextNode(textNode, insertionPosition.offsetInContainerNode());
             positionAfterSplit = firstPositionInNode(textNode.get());
+            if (!textNode->previousSibling())
+                return; // Bail out if mutation events detachd the split text node.
             insertionPosition.moveToPosition(textNode->previousSibling(), insertionPosition.offsetInContainerNode());
             visiblePos = VisiblePosition(insertionPosition);
         }