Reviewed by NOBODY (OOPS!).
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Dec 2004 18:13:22 +0000 (18:13 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 7 Dec 2004 18:13:22 +0000 (18:13 +0000)
        * khtml/editing/htmlediting.cpp:
        (khtml::InsertParagraphSeparatorInQuotedContentCommand::doApply): Fix a problem with my
        change in thei code yesterday. Call to insertBlockPlaceholderIfNeeded() must be done
        after new block has been inserted, otherwise a crash can result. Shuffle down call
        to insertBlockPlaceholderIfNeeded() a couple of lines (where the node is inserted),
        and all is good.

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

WebCore/ChangeLog-2005-08-23
WebCore/khtml/editing/htmlediting.cpp

index 34c0b6b07b6d3830fcdbc0455075cbcf437fa1f6..93b61dcf835f70608ac44331c658527ccb03a5d1 100644 (file)
@@ -1,3 +1,14 @@
+2004-12-07  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * khtml/editing/htmlediting.cpp:
+        (khtml::InsertParagraphSeparatorInQuotedContentCommand::doApply): Fix a problem with my
+        change in thei code yesterday. Call to insertBlockPlaceholderIfNeeded() must be done
+        after new block has been inserted, otherwise a crash can result. Shuffle down call 
+        to insertBlockPlaceholderIfNeeded() a couple of lines (where the node is inserted), 
+        and all is good.
+
 2004-12-07  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John
index 153fbcfd223976c20f3d14dc622ff4912b75546d..596ea0108bdd48941d350a2b48f20d45bd74e258 100644 (file)
@@ -2356,9 +2356,9 @@ void InsertParagraphSeparatorInQuotedContentCommand::doApply()
         // Insert a clone of the top blockquote after the break.
         NodeImpl *clonedBlockquote = topBlockquote->cloneNode(false);
         clonedBlockquote->ref();
-        insertBlockPlaceholderIfNeeded(clonedBlockquote);
         clonedNodes.append(clonedBlockquote);
         insertNodeAfter(clonedBlockquote, m_breakNode);
+        insertBlockPlaceholderIfNeeded(clonedBlockquote);
         
         // Make clones of ancestors in between the start node and the top blockquote.
         NodeImpl *parent = clonedBlockquote;