Merge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4

* changes:
  Merge WebKit at r65615 : Update WebKit revision number
  Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
  Merge WebKit at r65615 : Android-specific results for Geolocation tests.
  Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.
  Merge WebKit at r65615 : processingUserGesture() is now static.
  Merge WebKit at r65615 : UTF8String() becomes utf8().
  Merge WebKit at r65615 : Fix include paths for string headers.
  Merge WebKit at r65615 : Fix Makefiles.
  Merge WebKit at r65615 : Fix conflicts.
  Merge WebKit at r65615 : Initial merge by git.

1 files changed, 2 insertions, 1 deletions

diff --git a/WebCore/editing/DeleteSelectionCommand.cpp b/WebCore/editing/DeleteSelectionCommand.cpp
index c37b0fc..5e025eb 100644
--- a/WebCore/editing/DeleteSelectionCommand.cpp
+++ b/WebCore/editing/DeleteSelectionCommand.cpp
@@ -630,7 +630,8 @@ void DeleteSelectionCommand::mergeParagraphs()
     // moveParagraphs will insert placeholders if it removes blocks that would require their use, don't let block
     // removals that it does cause the insertion of *another* placeholder.
     bool needPlaceholder = m_needPlaceholder;
-    moveParagraph(startOfParagraphToMove, endOfParagraphToMove, mergeDestination);
+    bool paragraphToMergeIsEmpty = (startOfParagraphToMove == endOfParagraphToMove);
+    moveParagraph(startOfParagraphToMove, endOfParagraphToMove, mergeDestination, false, !paragraphToMergeIsEmpty);
     m_needPlaceholder = needPlaceholder;
     // The endingPosition was likely clobbered by the move, so recompute it (moveParagraph selects the moved paragraph).
     m_endingPosition = endingSelection().start();