Move ComputeTextRects before Range::BoundingBox()

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

Index: third_party/WebKit/Source/core/dom/Range.cpp
diff --git a/third_party/WebKit/Source/core/dom/Range.cpp b/third_party/WebKit/Source/core/dom/Range.cpp
index a34467ca556c983820440502773e6e3a72ab2688..4aee6a6586df85ca94fde060f426452d35af3bcb 100644
--- a/third_party/WebKit/Source/core/dom/Range.cpp
+++ b/third_party/WebKit/Source/core/dom/Range.cpp
@@ -1476,25 +1476,39 @@ static Vector<IntRect> computeTextRects(const EphemeralRange& range) {
   return rects;
 }
 
+// TODO(tanvir.rizvi): We should move this implementation to VisibleUnits and
+// then this function will be removed.
+static void ComputeTextQuads(Vector<FloatQuad>*, const EphemeralRange&, bool);
+
 void Range::TextQuads(Vector<FloatQuad>& quads,
                       bool use_selection_height) const {
-  Node* start_container = &start_.Container();
+  ComputeTextQuads(&quads, EphemeralRange(this), use_selection_height);
+}
+
+static void ComputeTextQuads(Vector<FloatQuad>* quads,

[yosin_UTC9, 2017/04/20 06:59:54]

Could you returnVector<FloatQuad> instead of void + |Vector<FloatQuad>*| as same
as |computeTextRects()|?
See also: http://crrev.com/2810313003: In-place change of Range::testRects() and
boundingBox() to EphemeralRange.
Note: we don't need to pass |use_selection_height|

It seems |computeTextQuads()| is as same as |computeTextRects()| except for
returning |Vector<FloatRect>| or |Vector<IntRect>|.
Is it better to use template to share algorithm?

static void CollectAbsoluteBoundsForRange(Vector<IntRect> acc, ...) {
layout_text->AbsoulteRectsForRange(acc, ...); }
static void CollectAbsoluteBoundsForRange(Vector<FloatRect> acc, ...) {
layout_text->AbsoulteQuadsForRange(acc, ...); }

template <typename ElementType>
static computeTextBounds(...) {
   ...
   Vector<ElementType> result;
   for (...) {
     ...
     CollectAbosluteBoundsForRange(result, ...);
   }
}

IntRect Range::BoundingBox() const {
   const Vector<IntRect>& rects =
ComputeTextBounds<IntRect>(EphemeralRange(this));
  for (const IntRect& rect : rects)
    result.Unite(rect); 
   return results;
}

void Range::TextQuads(Vector<FloatQuad>& quads) const {
 const Vector<FloatQuad>& result =
ComputeTextBounds<FloatQuad>(EpehemralRange(this), ...);
 quads.insert(quads.end(), result.begin(), result().end());
}

Note: Since all call sites, there are two, one is RageTest.cpp and another is
LayoutObject::AbsoluteBoundingBoxRectForRange()
call TextQuad() with empty vector, we don't need to use
std::vector<T>::insert().

So, we'll change them to take result by function return value instead of output
parameter.

+                             const EphemeralRange& range,
+                             bool use_selection_height) {
+  // start_position and end_position are offsetInAnchor.
+  const Position& start_position = range.StartPosition();
+  DCHECK(start_position.IsOffsetInAnchor());
+  const Position& end_position = range.EndPosition();
+  DCHECK(end_position.IsOffsetInAnchor());
+  Node* start_container = start_position.ComputeContainerNode();
   DCHECK(start_container);
-  Node* end_container = &end_.Container();
+  Node* end_container = end_position.ComputeContainerNode();
   DCHECK(end_container);
 
-  Node* stop_node = PastLastNode();
-  for (Node* node = FirstNode(); node != stop_node;
-       node = NodeTraversal::Next(*node)) {
-    LayoutObject* r = node->GetLayoutObject();
-    if (!r || !r->IsText())
+  for (Node& node : range.Nodes()) {
+    LayoutObject* const layout_object = node.GetLayoutObject();
+    if (!layout_object || !layout_object->IsText())
       continue;
-    LayoutText* layout_text = ToLayoutText(r);
-    unsigned start_offset = node == start_container ? start_.Offset() : 0;
+    LayoutText* layout_text = ToLayoutText(layout_object);
+    unsigned start_offset =
+        node == start_container ? start_position.OffsetInContainerNode() : 0;
     unsigned end_offset = node == end_container
-                              ? end_.Offset()
+                              ? end_position.OffsetInContainerNode()
                               : std::numeric_limits<unsigned>::max();
-    layout_text->AbsoluteQuadsForRange(quads, start_offset, end_offset,
+    layout_text->AbsoluteQuadsForRange(*quads, start_offset, end_offset,
                                        use_selection_height);
   }
 }