Handle special case of merging lists in mergeParagraphs()

Source/core/editing/DeleteSelectionCommand.cpp

 /*
  * Copyright (C) 2005 Apple Computer, 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 621 matching lines @@
     }
 
     if (mergeDestination == startOfParagraphToMove)
         return;
 
     VisiblePosition endOfParagraphToMove = endOfParagraph(startOfParagraphToMove);
 
     if (mergeDestination == endOfParagraphToMove)
         return;
 
+    // If the merge destination and source to be moved are both list items of different lists, merge them into single list.
+    Node* listItemInFirstParagraph = enclosingNodeOfType(m_upstreamStart, &isListItem);

[yosin_UTC9, 2013/12/12 04:20:45]

nit: You don't need to have "&" for isListItem.

+    Node* listItemInSecondParagraph = enclosingNodeOfType(m_downstreamEnd, &isListItem);

[yosin_UTC9, 2013/12/12 04:20:45]

nit: You don't need to have "&" for isListItem.

+    if (listItemInFirstParagraph && listItemInSecondParagraph

[yosin_UTC9, 2013/12/12 04:20:45]

ni: Can we merge if-conditions of L645 and L647?

+        && listItemInFirstParagraph->parentElement() != listItemInSecondParagraph->parentElement()) {
+        if (canMergeLists(listItemInFirstParagraph->parentElement(), listItemInSecondParagraph->parentElement())) {
+            mergeIdenticalElements(listItemInFirstParagraph->parentElement(), listItemInSecondParagraph->parentElement());
+            return;
+        }
+    }
+
     // The rule for merging into an empty block is: only do so if its farther to the right.
     // FIXME: Consider RTL.
     if (!m_startsAtEmptyLine && isStartOfParagraph(mergeDestination) && startOfParagraphToMove.absoluteCaretBounds().x() > mergeDestination.absoluteCaretBounds().x()) {
         if (mergeDestination.deepEquivalent().downstream().deprecatedNode()->hasTagName(brTag)) {
             removeNodeAndPruneAncestors(mergeDestination.deepEquivalent().downstream().deprecatedNode());
             m_endingPosition = startOfParagraphToMove.deepEquivalent();
             return;
         }
     }
 
@@ skipping 203 matching lines @@
 
 // Normally deletion doesn't preserve the typing style that was present before it.  For example,
 // type a character, Bold, then delete the character and start typing.  The Bold typing style shouldn't
 // stick around.  Deletion should preserve a typing style that *it* sets, however.
 bool DeleteSelectionCommand::preservesTypingStyle() const
 {
     return m_typingStyle;
 }
 
 } // namespace WebCore