Keep br while replacing plain texts with content ending with newline

Source/core/editing/ReplaceSelectionCommand.cpp

 /*
  * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009, 2010, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1108 matching lines @@
         insertionBlock = 0;
 
     VisiblePosition startOfInsertedContent = firstPositionInOrBeforeNode(insertedNodes.firstNodeInserted());
 
     // We inserted before the insertionBlock to prevent nesting, and the content before the insertionBlock wasn't in its own block and
     // didn't have a br after it, so the inserted content ended up in the same paragraph.
     if (insertionBlock && insertionPos.deprecatedNode() == insertionBlock->parentNode() && (unsigned)insertionPos.deprecatedEditingOffset() < insertionBlock->nodeIndex() && !isStartOfParagraph(startOfInsertedContent))
         insertNodeAt(createBreakElement(document()).get(), startOfInsertedContent.deepEquivalent());
 
     if (endBR && (plainTextFragment || shouldRemoveEndBR(endBR, originalVisPosBeforeEndBR))) {
-        RefPtr<Node> parent = endBR->parentNode();
-        insertedNodes.willRemoveNode(*endBR);
-        removeNode(endBR);
-        if (Node* nodeToRemove = highestNodeToRemoveInPruning(parent.get())) {
-            insertedNodes.willRemoveNode(*nodeToRemove);
-            removeNode(nodeToRemove);
+        // Don't remove br if we are replacing plain texts with content ending with newline
+        if (!(fragment.hasInterchangeNewlineAtEnd()  && selectionIsPlainText)) {

[yosin_UTC9, 2013/12/20 01:23:06]

nit: Please merge L1130 condition into L1129.

+            RefPtr<Node> parent = endBR->parentNode();
+            insertedNodes.willRemoveNode(*endBR);
+            removeNode(endBR);
+            if (Node* nodeToRemove = highestNodeToRemoveInPruning(parent.get())) {
+                insertedNodes.willRemoveNode(*nodeToRemove);
+                removeNode(nodeToRemove);
+            }
         }
     }
 
     makeInsertedContentRoundTrippableWithHTMLTreeBuilder(insertedNodes);
 
     removeRedundantStylesAndKeepStyleSpanInline(insertedNodes);
 
     if (m_sanitizeFragment)
         applyCommandToComposite(SimplifyMarkupCommand::create(document(), insertedNodes.firstNodeInserted(), insertedNodes.pastLastLeaf()));
 
@@ skipping 349 matching lines @@
         removeNodeAndPruneAncestors(nodeAfterInsertionPos.get());
 
     VisibleSelection selectionAfterReplace(m_selectReplacement ? start : end, end);
 
     setEndingSelection(selectionAfterReplace);
 
     return true;
 }
 
 } // namespace WebCore