Make Range::TextQuads() to use ComputeTextBounds() template function.

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 1429 matching lines @@
   return EndPosition().NodeAsRangePastLastNode();
 }
 
 static void CollectAbsoluteBoundsForRange(unsigned start,
                                           unsigned end,
                                           const LayoutText& layout_text,
                                           Vector<IntRect>& rects) {
   layout_text.AbsoluteRectsForRange(rects, start, end);
 }
 
+static void CollectAbsoluteBoundsForRange(unsigned start,
+                                          unsigned end,
+                                          const LayoutText& layout_text,
+                                          Vector<FloatQuad>& quads) {
+  layout_text.AbsoluteQuadsForRange(quads, start, end);
+}
+
 template <typename RectType>
 static Vector<RectType> 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<RectType> result;
@@ skipping 10 matching lines @@
     CollectAbsoluteBoundsForRange(start_offset, end_offset, *layout_text,
                                   result);
   }
   return result;
 }
 
 static Vector<IntRect> computeTextRects(const EphemeralRange& range) {
   return ComputeTextBounds<IntRect>(range);
 }
 
+static Vector<FloatQuad> computeTextQuads(const EphemeralRange& range) {
+  return ComputeTextBounds<FloatQuad>(range);
+}
+
 IntRect Range::BoundingBox() const {
   IntRect result;
   const Vector<IntRect>& rects = computeTextRects(EphemeralRange(this));
   for (const IntRect& rect : rects)
     result.Unite(rect);
   return result;
 }
 
 void Range::TextQuads(Vector<FloatQuad>& quads,
                       bool use_selection_height) const {
-  Node* start_container = &start_.Container();
-  DCHECK(start_container);
-  Node* end_container = &end_.Container();
-  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())
-      continue;
-    LayoutText* layout_text = ToLayoutText(r);
-    unsigned start_offset = node == start_container ? start_.Offset() : 0;
-    unsigned end_offset = node == end_container
-                              ? end_.Offset()
-                              : std::numeric_limits<unsigned>::max();
-    layout_text->AbsoluteQuadsForRange(quads, start_offset, end_offset,
-                                       use_selection_height);

[Xiaocheng, 2017/05/02 21:15:03]

Could you first remove |use_selection_height| from this function and
LayoutText::AbsoluteQuadsForRange()?

-  }
+  const Vector<FloatQuad>& result = computeTextQuads(EphemeralRange(this));
+  quads.insert(quads.size(), result);
 }
 
 bool AreRangesEqual(const Range* a, const Range* b) {
   if (a == b)
     return true;
   if (!a || !b)
     return false;
   return a->StartPosition() == b->StartPosition() &&
          a->EndPosition() == b->EndPosition();
 }
@@ skipping 315 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