Make PendingSelection::calcVisibleSelection() to return SelectionInFlatTree

third_party/WebKit/Source/core/editing/PendingSelection.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 37 matching lines @@
   const PositionInFlatTree& end = visibleSelection.end();
   if (end.isNotNull() && (!end.isConnected() || end.document() != document))
     return false;
   const PositionInFlatTree extent = visibleSelection.extent();
   if (extent.isNotNull() &&
       (!extent.isConnected() || extent.document() != document))
     return false;
   return true;
 }
 
-VisibleSelectionInFlatTree PendingSelection::calcVisibleSelection(
+SelectionInFlatTree PendingSelection::calcVisibleSelection(
     const VisibleSelectionInFlatTree& originalSelection) const {
   const PositionInFlatTree& start = originalSelection.start();
   const PositionInFlatTree& end = originalSelection.end();
   SelectionType selectionType = originalSelection.getSelectionType();
   const TextAffinity affinity = originalSelection.affinity();
 
   bool paintBlockCursor =
       m_frameSelection->shouldShowBlockCursor() &&
       selectionType == SelectionType::CaretSelection &&
       !isLogicalEndOfLine(createVisiblePosition(end, affinity));
-  VisibleSelectionInFlatTree selection;
   if (enclosingTextControl(start.computeContainerNode())) {
     // TODO(yosin) We should use |PositionMoveType::CodePoint| to avoid
     // ending paint at middle of character.
     PositionInFlatTree endPosition =
         paintBlockCursor ? nextPositionOf(originalSelection.extent(),
                                           PositionMoveType::CodeUnit)
                          : end;
-    selection.setWithoutValidation(start, endPosition);
-    return selection;
+    return SelectionInFlatTree::Builder()
+        .setBaseAndExtent(start, endPosition)
+        .build();
   }
 
   const VisiblePositionInFlatTree& visibleStart = createVisiblePosition(
       start, selectionType == SelectionType::RangeSelection
                  ? TextAffinity::Downstream
                  : affinity);
   if (visibleStart.isNull())
-    return VisibleSelectionInFlatTree();
+    return SelectionInFlatTree();
   if (paintBlockCursor) {
     const VisiblePositionInFlatTree visibleExtent = nextPositionOf(
         createVisiblePosition(end, affinity), CanSkipOverEditingBoundary);
     if (visibleExtent.isNull())
-      return VisibleSelectionInFlatTree();
+      return SelectionInFlatTree();
     SelectionInFlatTree::Builder builder;
     builder.collapse(visibleStart.toPositionWithAffinity());
     builder.extend(visibleExtent.deepEquivalent());
-    return createVisibleSelection(builder.build());
+    return builder.build();
   }
   const VisiblePositionInFlatTree visibleEnd =
       createVisiblePosition(end, selectionType == SelectionType::RangeSelection
                                      ? TextAffinity::Upstream
                                      : affinity);
   if (visibleEnd.isNull())
-    return VisibleSelectionInFlatTree();
+    return SelectionInFlatTree();
   SelectionInFlatTree::Builder builder;
   builder.collapse(visibleStart.toPositionWithAffinity());
   builder.extend(visibleEnd.deepEquivalent());
-  return createVisibleSelection(builder.build());
+  return builder.build();
 }
 
 void PendingSelection::commit(LayoutView& layoutView) {
   if (!hasPendingSelection())
     return;
   DCHECK(!layoutView.needsLayout());
   m_hasPendingSelection = false;
 
   const VisibleSelectionInFlatTree& originalSelection =
       m_frameSelection->computeVisibleSelectionInFlatTree();
 
   // Skip if pending VisibilePositions became invalid before we reach here.
   if (!isSelectionInDocument(originalSelection, layoutView.document()))
     return;
 
   // Construct a new VisibleSolution, since visibleSelection() is not
   // necessarily valid, and the following steps assume a valid selection. See
   // <https://bugs.webkit.org/show_bug.cgi?id=69563> and
   // <rdar://problem/10232866>.
   const VisibleSelectionInFlatTree& selection =
-      calcVisibleSelection(originalSelection);
+      createVisibleSelection(calcVisibleSelection(originalSelection));
 
   if (!selection.isRange()) {
     layoutView.clearSelection();
     return;
   }
 
   // Use the rightmost candidate for the start of the selection, and the
   // leftmost candidate for the end of the selection. Example: foo <a>bar</a>.
   // Imagine that a line wrap occurs after 'foo', and that 'bar' is selected.
   // If we pass [foo, 3] as the start of the selection, the selection painting
@@ skipping 23 matching lines @@
   DCHECK(layoutView == endLayoutObject->view());
   layoutView.setSelection(startLayoutObject, startPos.computeEditingOffset(),
                           endLayoutObject, endPos.computeEditingOffset());
 }
 
 DEFINE_TRACE(PendingSelection) {
   visitor->trace(m_frameSelection);
 }
 
 }  // namespace blink