Get rid of flat tree version of createVisibleSelection() taking two VisiblePosition

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 59 matching lines @@
   // When a selection ends at the start of a paragraph, we rarely paint
   // the selection gap before that paragraph, because there often is no gap.
   // In a case like this, it's not obvious to the user that the selection
   // ends "inside" that paragraph, so it would be confusing if Indent/Outdent
   // operated on that paragraph.
   // FIXME: We paint the gap before some paragraphs that are indented with left
   // margin/padding, but not others.  We should make the gap painting more
   // consistent and then use a left margin/padding rule here.
   if (visibleEnd.deepEquivalent() != visibleStart.deepEquivalent() &&
       isStartOfParagraph(visibleEnd)) {
-    VisibleSelection newSelection = createVisibleSelection(
-        visibleStart,
-        previousPositionOf(visibleEnd, CannotCrossEditingBoundary),
-        endingSelection().isDirectional());
+    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 =
+        createVisibleSelection(builder.build());
     if (newSelection.isNone())
       return;
     setEndingSelection(newSelection);
   }
 
   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())
+    if (start.isNotNull() && end.isNotNull()) {
       setEndingSelection(createVisibleSelection(
-          start, end, endingSelection().isDirectional()));
+          SelectionInDOMTree::Builder()
+              .collapse(start.toPositionWithAffinity())
+              .extend(end.deepEquivalent())
+              .setIsDirectional(endingSelection().isDirectional())
+              .build()));
+    }
   }
 }
 
 static bool isAtUnsplittableElement(const Position& pos) {
   Node* node = pos.anchorNode();
   return node == rootEditableElementOf(pos) ||
          node == enclosingNodeOfType(pos, &isTableCell);
 }
 
 void ApplyBlockElementCommand::formatSelection(
@@ skipping 256 matching lines @@
     element->setAttribute(styleAttr, m_inlineStyle);
   return element;
 }
 
 DEFINE_TRACE(ApplyBlockElementCommand) {
   visitor->trace(m_endOfLastParagraph);
   CompositeEditCommand::trace(visitor);
 }
 
 }  // namespace blink