Introduce ComputeTextBounds template in Range.cpp

third_party/WebKit/Source/core/dom/Range.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Gunnstein Lye (gunnstein@netcom.no)
  * (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
  * (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2011 Motorola Mobility. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1422 matching lines @@
 }
 
 Node* Range::FirstNode() const {
   return StartPosition().NodeAsRangeFirstNode();
 }
 
 Node* Range::PastLastNode() const {
   return EndPosition().NodeAsRangePastLastNode();
 }
 
-static Vector<IntRect> computeTextRects(const EphemeralRange& range) {
+static void CollectAbsoluteBoundsForRange(Vector<IntRect>& rects,
+                                          unsigned start,
+                                          unsigned end,
+                                          LayoutText* layout_text) {

[yosin_UTC9, 2017/04/25 06:54:34]

nit: s/LayoutText*/const LayoutText&/

Please wait for patch[1]

[1] http://crrev.com/2837273002: Mark LayoutText::AbsoluteRectsForRange() and
AbsoluteQuadsForRange() as const member function

[tanvir, 2017/04/26 09:36:30]

Done.

+  layout_text->AbsoluteRectsForRange(rects, start, end);
+}
+
+template <typename ElementType>
+static Vector<ElementType> ComputeTextBounds(const EphemeralRange& range) {
   const Position& start_position = range.StartPosition();
   const Position& end_position = range.EndPosition();
   Node* const start_container = start_position.ComputeContainerNode();
   DCHECK(start_container);
   Node* const end_container = end_position.ComputeContainerNode();
   DCHECK(end_container);
 
-  Vector<IntRect> rects;
+  Vector<ElementType> result;
   for (const Node& node : range.Nodes()) {
     LayoutObject* const layoutObject = node.GetLayoutObject();
     if (!layoutObject || !layoutObject->IsText())
       continue;
     LayoutText* layout_text = ToLayoutText(layoutObject);
     unsigned start_offset =
         node == start_container ? start_position.OffsetInContainerNode() : 0;
     unsigned end_offset = node == end_container
                               ? end_position.OffsetInContainerNode()
                               : std::numeric_limits<unsigned>::max();
-    layout_text->AbsoluteRectsForRange(rects, start_offset, end_offset);
+    CollectAbsoluteBoundsForRange(result, start_offset, end_offset,
+                                  layout_text);
   }
-  return rects;
+  return result;
+}
+
+static Vector<IntRect> computeTextRects(const EphemeralRange& range) {
+  return ComputeTextBounds<IntRect>(range);
 }
 
 IntRect Range::BoundingBox() const {
   IntRect result;
   const Vector<IntRect>& rects = computeTextRects(EphemeralRange(this));
   for (const IntRect& rect : rects)
     result.Unite(rect);
   return result;
 }
 
@@ skipping 346 matching lines @@
                      .data()
               << "start offset: " << range->startOffset()
               << ", end offset: " << range->endOffset();
   } else {
     LOG(INFO) << "Cannot show tree if range is null, or if boundary points are "
                  "invalid.";
   }
 }
 
 #endif