Fixing indent/outdent for <li> elements containing children spanning across

Source/core/editing/IndentOutdentCommand.cpp

 /*
  * Copyright (C) 2006, 2008 Apple 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 54 matching lines @@
     if (!selectedListItem->hasTagName(liTag))
         return false;
 
     // FIXME: previousElementSibling does not ignore non-rendered content like <span></span>.  Should we?
     RefPtr<Element> previousList = selectedListItem->previousElementSibling();
     RefPtr<Element> nextList = selectedListItem->nextElementSibling();
 
     // We should calculate visible range in list item because inserting new
     // list element will change visibility of list item, e.g. :first-child
     // CSS selector.
-    VisiblePosition startOfMove(start);

[yosin_UTC9, 2013/11/20 05:01:49]

Since r162080, we don't need to take care about insertNodeBefore() in edit
command implementation for recursive call of execCommand() by iframe/@src. So,
it is safe to remove them.

-    VisiblePosition endOfMove(end);
-
     RefPtr<Element> newList = document().createElement(listNode->tagQName(), false);
     insertNodeBefore(newList, selectedListItem.get());
 
-    moveParagraphWithClones(startOfMove, endOfMove, newList.get(), selectedListItem.get());
+    // We should clone all the children of the list item for indenting purposes. However, in case the current
+    // selection does not encompass all its children, we need to explicitally handle the same. The original
+    // list item too would require proper deletion in that case.
+    if (end.deprecatedNode() == selectedListItem.get() || end.deprecatedNode()->isDescendantOf(selectedListItem->lastChild())) {

[yosin_UTC9, 2013/11/20 05:01:49]

nit: s/deprecatedNode/anchorNode/g

[arpitab_, 2013/11/20 13:07:52]

Done.

+        moveParagraphWithClones(start, end, newList.get(), selectedListItem.get());
+    } else {
+        moveParagraphWithClones(start, positionAfterNode(selectedListItem->lastChild()), newList.get(), selectedListItem.get());
+        removeNode(selectedListItem.get());
+    }
 
     if (canMergeLists(previousList.get(), newList.get()))
         mergeIdenticalElements(previousList.get(), newList.get());
     if (canMergeLists(newList.get(), nextList.get()))
         mergeIdenticalElements(newList.get(), nextList.get());
 
     return true;
 }
 
 void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Position& end, RefPtr<Element>& targetBlockquote)
@@ skipping 141 matching lines @@
 
 void IndentOutdentCommand::formatRange(const Position& start, const Position& end, const Position&, RefPtr<Element>& blockquoteForNextIndent)
 {
     if (tryIndentingAsListItem(start, end))
         blockquoteForNextIndent = 0;
     else
         indentIntoBlockquote(start, end, blockquoteForNextIndent);
 }
 
 }