Utilize EditCommand::setEndingSelection() taking SelectionInDOMTree

third_party/WebKit/Source/core/editing/commands/ApplyBlockElementCommand.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2010 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 67 matching lines @@
   if (visibleEnd.deepEquivalent() != visibleStart.deepEquivalent() &&
       isStartOfParagraph(visibleEnd)) {
     const Position& newEnd =
         previousPositionOf(visibleEnd, CannotCrossEditingBoundary)
             .deepEquivalent();
     SelectionInDOMTree::Builder builder;
     builder.collapse(visibleStart.toPositionWithAffinity());
     if (newEnd.isNotNull())
       builder.extend(newEnd);
     builder.setIsDirectional(endingSelection().isDirectional());
     const VisibleSelection newSelection =

[Xiaocheng, 2016/10/28 02:25:26]

We can remove |newSelection|, as |builder| builds a non-null selection here.

         createVisibleSelection(builder.build());
     if (newSelection.isNone())
       return;
-    setEndingSelection(newSelection);
+    setEndingSelection(builder.build());
   }
 
   VisibleSelection selection =
       selectionForParagraphIteration(endingSelection());
   VisiblePosition startOfSelection = selection.visibleStart();
   VisiblePosition endOfSelection = selection.visibleEnd();
   DCHECK(!startOfSelection.isNull());
   DCHECK(!endOfSelection.isNull());
   ContainerNode* startScope = nullptr;
   int startIndex = indexForVisiblePosition(startOfSelection, startScope);
   ContainerNode* endScope = nullptr;
   int endIndex = indexForVisiblePosition(endOfSelection, endScope);
 
   formatSelection(startOfSelection, endOfSelection, editingState);
   if (editingState->isAborted())
     return;
 
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   DCHECK_EQ(startScope, endScope);
   DCHECK_GE(startIndex, 0);
   DCHECK_LE(startIndex, endIndex);
   if (startScope == endScope && startIndex >= 0 && startIndex <= endIndex) {
     VisiblePosition start(visiblePositionForIndex(startIndex, startScope));
     VisiblePosition end(visiblePositionForIndex(endIndex, endScope));
     if (start.isNotNull() && end.isNotNull()) {
-      setEndingSelection(createVisibleSelection(
+      setEndingSelection(
           SelectionInDOMTree::Builder()
               .collapse(start.toPositionWithAffinity())
               .extend(end.deepEquivalent())
               .setIsDirectional(endingSelection().isDirectional())
-              .build()));
+              .build());
     }
   }
 }
 
 static bool isAtUnsplittableElement(const Position& pos) {
   Node* node = pos.anchorNode();
   return node == rootEditableElementOf(pos) ||
          node == enclosingNodeOfType(pos, &isTableCell);
 }
 
 void ApplyBlockElementCommand::formatSelection(
     const VisiblePosition& startOfSelection,
     const VisiblePosition& endOfSelection,
     EditingState* editingState) {
   // Special case empty unsplittable elements because there's nothing to split
   // and there's nothing to move.
   Position start = mostForwardCaretPosition(startOfSelection.deepEquivalent());
   if (isAtUnsplittableElement(start)) {
     HTMLElement* blockquote = createBlockElement();
     insertNodeAt(blockquote, start, editingState);
     if (editingState->isAborted())
       return;
     HTMLBRElement* placeholder = HTMLBRElement::create(document());
     appendNode(placeholder, blockquote, editingState);
     if (editingState->isAborted())
       return;
-    document().updateStyleAndLayoutIgnorePendingStylesheets();
-    setEndingSelection(createVisibleSelection(
-        SelectionInDOMTree::Builder()
-            .collapse(Position::beforeNode(placeholder))
-            .setIsDirectional(endingSelection().isDirectional())
-            .build()));
+    setEndingSelection(SelectionInDOMTree::Builder()
+                           .collapse(Position::beforeNode(placeholder))
+                           .setIsDirectional(endingSelection().isDirectional())
+                           .build());
     return;
   }
 
   HTMLElement* blockquoteForNextIndent = nullptr;
   VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection);
   VisiblePosition endOfLastParagraph = endOfParagraph(endOfSelection);
   Position endAfterSelection =
       endOfParagraph(nextPositionOf(endOfLastParagraph)).deepEquivalent();
   m_endOfLastParagraph = endOfLastParagraph.deepEquivalent();
 
@@ skipping 227 matching lines @@
     element->setAttribute(styleAttr, m_inlineStyle);
   return element;
 }
 
 DEFINE_TRACE(ApplyBlockElementCommand) {
   visitor->trace(m_endOfLastParagraph);
   CompositeEditCommand::trace(visitor);
 }
 
 }  // namespace blink