Move ComputeTextRects and ComputeTextQuads to VisibleUnits.

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 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;
-  for (const Node& node : range.Nodes()) {
-    LayoutObject* const layoutObject = node.GetLayoutObject();

[Xiaocheng, 2017/05/11 18:28:20]

Good catch! Thanks!

-    if (!layoutObject || !layoutObject->IsText())
-      continue;
-    const 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();
-    CollectAbsoluteBoundsForRange(start_offset, end_offset, *layout_text,
-                                  result);
-  }
-  return result;
-}
-
-static Vector<IntRect> ComputeTextRects(const EphemeralRange& range) {
-  return ComputeTextBounds<IntRect>(range);
-}
-
-// TODO(tanvir.rizvi): We will replace Range::TextQuads with ComputeTextQuads
-// and get rid of Range::TextQuads.
-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;
 }
 
+// TODO(tanvir.rizvi): We will replace Range::TextQuads with
+// ComputeTextQuads(in VisibleUnits) and get rid of Range::TextQuads.
 void Range::TextQuads(Vector<FloatQuad>& quads) const {
   quads.AppendVector(ComputeTextQuads(EphemeralRange(this)));
 }
 
 bool AreRangesEqual(const Range* a, const Range* b) {
   if (a == b)
     return true;
   if (!a || !b)
     return false;
   return a->StartPosition() == b->StartPosition() &&
@@ skipping 317 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