Move FirstRectForRange() to VisibleUnits.

Move FirstRectForRange() to VisibleUnits, make |Editor| class simpler
for improving code health.

BUG=672405
Signed-off-by: Zhuoyu Qian <zhuoyu.qian@samsung.com>
Change-Id: Iaca3148ba5a6f186a7870ede3ef59e0ddf4078bd
Reviewed-on: https://chromium-review.googlesource.com/938888Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539765}

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

@@ -923,45 +923,6 @@ void Editor::ChangeSelectionAfterCommand(
   }
 }
 
-IntRect Editor::FirstRectForRange(const EphemeralRange& range) const {
-  DCHECK(!GetFrame().GetDocument()->NeedsLayoutTreeUpdate());
-  DocumentLifecycle::DisallowTransitionScope disallow_transition(
-      GetFrame().GetDocument()->Lifecycle());
-
-  LayoutUnit extra_width_to_end_of_line;
-  DCHECK(range.IsNotNull());
-
-  const PositionWithAffinity start_position(
-      CreateVisiblePosition(range.StartPosition()).DeepEquivalent(),
-      TextAffinity::kDownstream);
-  const IntRect start_caret_rect =
-      AbsoluteCaretRectOfPosition(start_position, &extra_width_to_end_of_line);
-  if (start_caret_rect.IsEmpty())
-    return IntRect();
-
-  const PositionWithAffinity end_position(
-      CreateVisiblePosition(range.EndPosition()).DeepEquivalent(),
-      TextAffinity::kUpstream);
-  const IntRect end_caret_rect = AbsoluteCaretRectOfPosition(end_position);
-  if (end_caret_rect.IsEmpty())
-    return IntRect();
-
-  if (start_caret_rect.Y() == end_caret_rect.Y()) {
-    // start and end are on the same line
-    return IntRect(
-        std::min(start_caret_rect.X(), end_caret_rect.X()),
-        start_caret_rect.Y(), abs(end_caret_rect.X() - start_caret_rect.X()),
-        std::max(start_caret_rect.Height(), end_caret_rect.Height()));
-  }
-
-  // start and end aren't on the same line, so go from start to the end of its
-  // line
-  return IntRect(
-      start_caret_rect.X(), start_caret_rect.Y(),
-      (start_caret_rect.Width() + extra_width_to_end_of_line).ToInt(),
-      start_caret_rect.Height());
-}
-
 EphemeralRange Editor::RangeForPoint(const IntPoint& frame_point) const {
   const PositionWithAffinity position_with_affinity =
       GetFrame().PositionForPoint(frame_point);

third_party/WebKit/Source/core/editing/Editor.h

@@ -220,8 +220,6 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
 
   void ComputeAndSetTypingStyle(CSSPropertyValueSet*, InputEvent::InputType);
 
-  // |firstRectForRange| requires up-to-date layout.
-  IntRect FirstRectForRange(const EphemeralRange&) const;
   EphemeralRange RangeForPoint(const IntPoint&) const;
 
   void RespondToChangedSelection();

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

@@ -538,10 +538,8 @@ bool FrameSelection::ComputeAbsoluteBounds(IntRect& anchor,
         ComputeVisibleSelectionInDOMTree().ToNormalizedEphemeralRange();
     if (selected_range.IsNull())
       return false;
-    anchor = frame_->GetEditor().FirstRectForRange(
-        EphemeralRange(selected_range.StartPosition()));
-    focus = frame_->GetEditor().FirstRectForRange(
-        EphemeralRange(selected_range.EndPosition()));
+    anchor = FirstRectForRange(EphemeralRange(selected_range.StartPosition()));
+    focus = FirstRectForRange(EphemeralRange(selected_range.EndPosition()));
   }
 
   if (!ComputeVisibleSelectionInDOMTree().IsBaseFirst())

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

@@ -1514,4 +1514,43 @@ FloatRect ComputeTextFloatRect(const EphemeralRange& range) {
   return ComputeTextRectTemplate(range);
 }
 
+IntRect FirstRectForRange(const EphemeralRange& range) {
+  DCHECK(!range.GetDocument().NeedsLayoutTreeUpdate());
+  DocumentLifecycle::DisallowTransitionScope disallow_transition(
+      range.GetDocument().Lifecycle());
+
+  LayoutUnit extra_width_to_end_of_line;
+  DCHECK(range.IsNotNull());
+
+  const PositionWithAffinity start_position(
+      CreateVisiblePosition(range.StartPosition()).DeepEquivalent(),
+      TextAffinity::kDownstream);
+  const IntRect start_caret_rect =
+      AbsoluteCaretRectOfPosition(start_position, &extra_width_to_end_of_line);
+  if (start_caret_rect.IsEmpty())
+    return IntRect();
+
+  const PositionWithAffinity end_position(
+      CreateVisiblePosition(range.EndPosition()).DeepEquivalent(),
+      TextAffinity::kUpstream);
+  const IntRect end_caret_rect = AbsoluteCaretRectOfPosition(end_position);
+  if (end_caret_rect.IsEmpty())
+    return IntRect();
+
+  if (start_caret_rect.Y() == end_caret_rect.Y()) {
+    // start and end are on the same line
+    return IntRect(
+        std::min(start_caret_rect.X(), end_caret_rect.X()),
+        start_caret_rect.Y(), abs(end_caret_rect.X() - start_caret_rect.X()),
+        std::max(start_caret_rect.Height(), end_caret_rect.Height()));
+  }
+
+  // start and end aren't on the same line, so go from start to the end of its
+  // line
+  return IntRect(
+      start_caret_rect.X(), start_caret_rect.Y(),
+      (start_caret_rect.Width() + extra_width_to_end_of_line).ToInt(),
+      start_caret_rect.Height());
+}
+
 }  // namespace blink

third_party/WebKit/Source/core/editing/VisibleUnits.h

@@ -281,6 +281,9 @@ CORE_EXPORT IntRect ComputeTextRect(const EphemeralRange&);
 IntRect ComputeTextRect(const EphemeralRangeInFlatTree&);
 FloatRect ComputeTextFloatRect(const EphemeralRange&);
 
+// |FirstRectForRange| requires up-to-date layout.
+IntRect FirstRectForRange(const EphemeralRange&);
+
 // Export below functions only for |VisibleUnit| family.
 enum BoundarySearchContextAvailability {
   kDontHaveMoreContext,

third_party/WebKit/Source/core/frame/WebLocalFrameImpl.cpp

@@ -1022,7 +1022,7 @@ bool WebLocalFrameImpl::FirstRectForCharacterRange(
       PlainTextRange(location, location + length).CreateRange(*editable);
   if (range.IsNull())
     return false;
-  IntRect int_rect = GetFrame()->GetEditor().FirstRectForRange(range);
+  IntRect int_rect = FirstRectForRange(range);
   rect_in_viewport = WebRect(int_rect);
   rect_in_viewport = GetFrame()->View()->ContentsToViewport(rect_in_viewport);
   return true;

third_party/WebKit/Source/core/input/EventHandler.cpp

@@ -1874,9 +1874,9 @@ WebInputEventResult EventHandler::ShowNonLocatedContextMenu(
   if (!override_target_element && ShouldShowContextMenuAtSelection(selection)) {
     DCHECK(!doc->NeedsLayoutTreeUpdate());
 
-    IntRect first_rect = frame_->GetEditor().FirstRectForRange(
-        selection.ComputeVisibleSelectionInDOMTree()
-            .ToNormalizedEphemeralRange());
+    IntRect first_rect =
+        FirstRectForRange(selection.ComputeVisibleSelectionInDOMTree()
+                              .ToNormalizedEphemeralRange());
 
     int x = right_aligned ? first_rect.MaxX() : first_rect.X();
     // In a multiline edit, firstRect.maxY() would end up on the next line, so