Simplify LayoutSelection::CalcSelection()

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 91 matching lines @@
 
   current_ = nullptr;
   return *this;
 }
 
 LayoutSelection::LayoutSelection(FrameSelection& frame_selection)
     : frame_selection_(&frame_selection),
       has_pending_selection_(false),
       paint_range_(SelectionPaintRange()) {}
 
-static SelectionInFlatTree CalcSelection(
-    const VisibleSelectionInFlatTree& original_selection,
-    bool should_show_blok_cursor) {
-  const PositionInFlatTree& start = original_selection.Start();
-  const PositionInFlatTree& end = original_selection.End();
-  SelectionType selection_type = original_selection.GetSelectionType();
-  const TextAffinity affinity = original_selection.Affinity();
-
-  bool paint_block_cursor =
-      should_show_blok_cursor &&
-      selection_type == SelectionType::kCaretSelection &&
-      !IsLogicalEndOfLine(CreateVisiblePosition(end, affinity));
-  if (EnclosingTextControl(start.ComputeContainerNode())) {
-    // TODO(yosin) We should use |PositionMoveType::CodePoint| to avoid
-    // ending paint at middle of character.
-    PositionInFlatTree end_position =
-        paint_block_cursor ? NextPositionOf(original_selection.Extent(),
-                                            PositionMoveType::kCodeUnit)
-                           : end;
-    return SelectionInFlatTree::Builder()
-        .SetBaseAndExtent(start, end_position)
-        .Build();
-  }
-
-  const VisiblePositionInFlatTree& visible_start = CreateVisiblePosition(
-      start, selection_type == SelectionType::kRangeSelection
-                 ? TextAffinity::kDownstream
-                 : affinity);
-  if (visible_start.IsNull())
-    return SelectionInFlatTree();
-  if (paint_block_cursor) {
-    const VisiblePositionInFlatTree visible_extent = NextPositionOf(
-        CreateVisiblePosition(end, affinity), kCanSkipOverEditingBoundary);
-    if (visible_extent.IsNull())
-      return SelectionInFlatTree();
-    SelectionInFlatTree::Builder builder;
-    builder.Collapse(visible_start.ToPositionWithAffinity());
-    builder.Extend(visible_extent.DeepEquivalent());
-    return builder.Build();
-  }
-  const VisiblePositionInFlatTree visible_end = CreateVisiblePosition(
-      end, selection_type == SelectionType::kRangeSelection
-               ? TextAffinity::kUpstream
-               : affinity);
-  if (visible_end.IsNull())
-    return SelectionInFlatTree();
-  SelectionInFlatTree::Builder builder;
-  builder.Collapse(visible_start.ToPositionWithAffinity());
-  builder.Extend(visible_end.DeepEquivalent());
-  return builder.Build();
+static bool ShouldShowBlockCursor(const FrameSelection& frame_selection,
+                                  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(
+    const FrameSelection& frame_selection) {
+  const VisibleSelectionInFlatTree& original_selection =
+      frame_selection.ComputeVisibleSelectionInFlatTree();
 
+  if (!ShouldShowBlockCursor(frame_selection, original_selection))
+    return original_selection;
+
+  const PositionInFlatTree end_position = NextPositionOf(
+      original_selection.Start(), PositionMoveType::kGraphemeCluster);
+  return CreateVisibleSelection(
+      SelectionInFlatTree::Builder()
+          .SetBaseAndExtent(original_selection.Start(), end_position)
+          .Build());
+}
 
 // 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>;
 struct SelectedMap {
@@ skipping 142 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& original_selection =
-      frame_selection.ComputeVisibleSelectionInFlatTree();
-  // 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 SelectionInFlatTree& new_selection = CalcSelection(
-      original_selection, frame_selection.ShouldShowBlockCursor());
-  const VisibleSelectionInFlatTree& selection =
-      CreateVisibleSelection(new_selection);
-
+  const VisibleSelectionInFlatTree& selection = CalcSelection(frame_selection);
   if (!selection.IsRange() || frame_selection.IsHidden())
     return SelectionPaintRange();
 
   DCHECK(!selection.IsNone());
   const PositionInFlatTree start_pos = selection.Start();
   const PositionInFlatTree end_pos = selection.End();
   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);
@@ skipping 67 matching lines @@
 
     runner->SetShouldInvalidateSelection();
   }
 }
 
 DEFINE_TRACE(LayoutSelection) {
   visitor->Trace(frame_selection_);
 }
 
 }  // namespace blink