Make CalcSelection return EphemeralRange.

third_party/WebKit/Source/core/editing/LayoutSelection.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 102 matching lines @@
                                   const VisibleSelectionInFlatTree& selection) {
   if (!frame_selection.ShouldShowBlockCursor())
     return false;
   if (selection.GetSelectionType() != SelectionType::kCaretSelection)
     return false;
   if (IsLogicalEndOfLine(selection.VisibleEnd()))
     return false;
   return true;
 }
 
-static VisibleSelectionInFlatTree CalcSelection(
+static EphemeralRangeInFlatTree CalcSelection(
     const FrameSelection& frame_selection) {
   const VisibleSelectionInFlatTree& original_selection =
       frame_selection.ComputeVisibleSelectionInFlatTree();
 
   if (!ShouldShowBlockCursor(frame_selection, original_selection))
-    return original_selection;
+    return {original_selection.Start(), original_selection.End()};
 
   const PositionInFlatTree end_position = NextPositionOf(
       original_selection.Start(), PositionMoveType::kGraphemeCluster);
-  return CreateVisibleSelection(
+  const VisibleSelectionInFlatTree& block_cursor = CreateVisibleSelection(
       SelectionInFlatTree::Builder()
           .SetBaseAndExtent(original_selection.Start(), end_position)
           .Build());
+  return {block_cursor.Start(), block_cursor.End()};
 }
 
 // Objects each have a single selection rect to examine.
 using SelectedObjectMap = HashMap<LayoutObject*, SelectionState>;
 // Blocks contain selected objects and fill gaps between them, either on the
 // left, right, or in between lines and blocks.
 // In order to get the visual rect right, we have to examine left, middle, and
 // right rects individually, since otherwise the union of those rects might
 // remain the same even when changes have occurred.
 using SelectedBlockMap = HashMap<LayoutBlock*, SelectionState>;
@@ skipping 143 matching lines @@
   paint_range_ = SelectionPaintRange();
 }
 
 static SelectionPaintRange CalcSelectionPaintRange(
     const FrameSelection& frame_selection) {
   const SelectionInDOMTree& selection_in_dom =
       frame_selection.GetSelectionInDOMTree();
   if (selection_in_dom.IsNone())
     return SelectionPaintRange();
 
-  const VisibleSelectionInFlatTree& selection = CalcSelection(frame_selection);
-  if (!selection.IsRange() || frame_selection.IsHidden())
+  const EphemeralRangeInFlatTree& selection = CalcSelection(frame_selection);
+  if (selection.IsCollapsed() || frame_selection.IsHidden())
     return SelectionPaintRange();
 
-  DCHECK(!selection.IsNone());
-  const PositionInFlatTree start_pos = selection.Start();
-  const PositionInFlatTree end_pos = selection.End();
+  const PositionInFlatTree start_pos = selection.StartPosition();
+  const PositionInFlatTree end_pos = selection.EndPosition();
   DCHECK_LE(start_pos, end_pos);
   LayoutObject* start_layout_object = start_pos.AnchorNode()->GetLayoutObject();
   LayoutObject* end_layout_object = end_pos.AnchorNode()->GetLayoutObject();
   DCHECK(start_layout_object);
   DCHECK(end_layout_object);
   DCHECK(start_layout_object->View() == end_layout_object->View());
 
   return SelectionPaintRange(start_layout_object,
                              start_pos.ComputeEditingOffset(),
                              end_layout_object, end_pos.ComputeEditingOffset());
@@ skipping 61 matching lines @@
 
     runner->SetShouldInvalidateSelection();
   }
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink