Make RenderedRectsForMarkers() to ignore disconnected nodes.

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 1425 matching lines @@
 
 Node* Range::pastLastNode() const {
   if (m_end.container()->isCharacterDataNode())
     return NodeTraversal::nextSkippingChildren(*m_end.container());
   if (Node* child = NodeTraversal::childAt(*m_end.container(), m_end.offset()))
     return child;
   return NodeTraversal::nextSkippingChildren(*m_end.container());
 }
 
 IntRect Range::boundingBox() const {
+  return computeBoundingBox(EphemeralRange(this));
+}
+
+template <typename Strategy>
+static Vector<IntRect> computeTextRects(
+    const EphemeralRangeTemplate<Strategy>& range) {
+  const PositionTemplate<Strategy> startPosition = range.startPosition();
+  const PositionTemplate<Strategy> endPosition = range.endPosition();
+  Node* startContainer = startPosition.computeContainerNode();
+  DCHECK(startContainer);
+  Node* endContainer = endPosition.computeContainerNode();
+  DCHECK(endContainer);
+  Vector<IntRect> rects;
+  for (Node& node : range.nodes()) {
+    LayoutObject* layoutObject = node.layoutObject();
+    if (!layoutObject || !layoutObject->isText())
+      continue;
+    LayoutText* layoutText = toLayoutText(layoutObject);
+    unsigned startOffset =
+        node == startContainer ? startPosition.offsetInContainerNode() : 0;
+    unsigned endOffset = node == endContainer
+                             ? endPosition.offsetInContainerNode()
+                             : std::numeric_limits<unsigned>::max();
+    layoutText->absoluteRectsForRange(rects, startOffset, endOffset);
+  }
+  return rects;

[yosin_UTC9, 2017/04/04 01:20:39]

nit: s/rects/std::move(rects)/

This is subject to RVO[1]. But, it is better to specify it for disambiguation.

[1] https://en.wikipedia.org/wiki/Return_value_optimization

[Hwanseung Lee, 2017/04/05 15:21:30]

Done.

+}
+
+IntRect Range::computeBoundingBox(const EphemeralRange& range) const {

[yosin_UTC9, 2017/04/04 01:20:39]

We don't need to make |computeBoundingBox()| as member of Range.
Move outside Range as global function in Range.h.

Another patch will move |computeBoundingBox()| to "VisibleUnits.{cpp,h}"

[Hwanseung Lee, 2017/04/05 15:21:30]

Done.

   IntRect result;
-  Vector<IntRect> rects;
-  textRects(rects);
-  for (const IntRect& rect : rects)
+  for (const IntRect& rect : computeTextRects(range))
     result.unite(rect);
   return result;
 }
 
-void Range::textRects(Vector<IntRect>& rects, bool useSelectionHeight) const {
-  Node* startContainer = m_start.container();
-  DCHECK(startContainer);
-  Node* endContainer = m_end.container();
-  DCHECK(endContainer);
-
-  Node* stopNode = pastLastNode();
-  for (Node* node = firstNode(); node != stopNode;
-       node = NodeTraversal::next(*node)) {
-    LayoutObject* r = node->layoutObject();
-    if (!r || !r->isText())
-      continue;
-    LayoutText* layoutText = toLayoutText(r);
-    unsigned startOffset = node == startContainer ? m_start.offset() : 0;
-    unsigned endOffset = node == endContainer
-                             ? m_end.offset()
-                             : std::numeric_limits<unsigned>::max();
-    layoutText->absoluteRectsForRange(rects, startOffset, endOffset,
-                                      useSelectionHeight);
-  }
-}
-
 void Range::textQuads(Vector<FloatQuad>& quads, bool useSelectionHeight) const {
   Node* startContainer = m_start.container();
   DCHECK(startContainer);
   Node* endContainer = m_end.container();
   DCHECK(endContainer);
 
   Node* stopNode = pastLastNode();
   for (Node* node = firstNode(); node != stopNode;
        node = NodeTraversal::next(*node)) {
     LayoutObject* r = node->layoutObject();
@@ skipping 326 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