LayoutObject::absoluteBoundingBoxRectForRange() should take EphemeralRange

third_party/WebKit/Source/web/TextFinder.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 147 matching lines @@
   }
 
   // If the user is browsing a page with autosizing, adjust the zoom to the
   // column where the next hit has been found. Doing this when autosizing is
   // not set will result in a zoom reset on small devices.
   if (ownerFrame()
           .frame()
           ->document()
           ->textAutosizer()
           ->pageNeedsAutosizing()) {
+    const EphemeralRange range(m_activeMatch.get());
     ownerFrame().viewImpl()->zoomToFindInPageRect(
-        ownerFrame().frameView()->contentsToRootFrame(
-            enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(
-                m_activeMatch.get()))));
+        ownerFrame().frameView()->contentsToRootFrame(enclosingIntRect(
+            LayoutObject::absoluteBoundingBoxRectForRange(range))));
   }
 
   bool wasActiveFrame = m_currentActiveMatchFrame;
   m_currentActiveMatchFrame = true;
 
   bool isActive = setMarkerActive(m_activeMatch.get(), true);
   if (activeNow)
     *activeNow = isActive;
 
   // Make sure no node is focused. See http://crbug.com/38700.
@@ skipping 340 matching lines @@
 void TextFinder::updateFindMatchRects() {
   IntSize currentContentsSize = ownerFrame().contentsSize();
   if (m_contentsSizeForCurrentFindMatchRects != currentContentsSize) {
     m_contentsSizeForCurrentFindMatchRects = currentContentsSize;
     m_findMatchRectsAreValid = false;
   }
 
   size_t deadMatches = 0;
   for (FindMatch& match : m_findMatchesCache) {
     if (!match.m_range->boundaryPointsValid() ||
-        !match.m_range->startContainer()->isConnected())
+        !match.m_range->startContainer()->isConnected()) {
       match.m_rect = FloatRect();
-    else if (!m_findMatchRectsAreValid)
-      match.m_rect = findInPageRectFromRange(match.m_range.get());
+    } else if (!m_findMatchRectsAreValid) {
+      EphemeralRange range(match.m_range.get());

[Xiaocheng, 2017/03/28 21:29:34]

nit: |const EphemeralRange|

[tanvir, 2017/03/30 19:11:06]

Done.

+      match.m_rect = findInPageRectFromRange(range);
+    }
 
     if (match.m_rect.isEmpty())
       ++deadMatches;
   }
 
   // Remove any invalid matches from the cache.
   if (deadMatches) {
     HeapVector<FindMatch> filteredMatches;
     filteredMatches.reserveCapacity(m_findMatchesCache.size() - deadMatches);
 
@@ skipping 13 matching lines @@
       toWebLocalFrameImpl(child)->ensureTextFinder().m_findMatchRectsAreValid =
           false;
 
   m_findMatchRectsAreValid = true;
 }
 
 WebFloatRect TextFinder::activeFindMatchRect() {
   if (!m_currentActiveMatchFrame || !m_activeMatch)
     return WebFloatRect();
 
-  return WebFloatRect(findInPageRectFromRange(activeMatch()));
+  EphemeralRange range(activeMatch());

[Xiaocheng, 2017/03/28 21:29:34]

nit: |const EphemeralRange|

[tanvir, 2017/03/30 19:11:06]

Done.

+  return WebFloatRect(findInPageRectFromRange(range));
 }
 
 void TextFinder::findMatchRects(WebVector<WebFloatRect>& outputRects) {
   updateFindMatchRects();
 
   Vector<WebFloatRect> matchRects;
   matchRects.reserveCapacity(matchRects.size() + m_findMatchesCache.size());
   for (const FindMatch& match : m_findMatchesCache) {
     DCHECK(!match.m_rect.isEmpty());
     matchRects.push_back(match.m_rect);
@@ skipping 58 matching lines @@
 
     // Clear any user selection, to make sure Find Next continues on from the
     // match we just activated.
     ownerFrame().frame()->selection().clear();
 
     // Make sure no node is focused. See http://crbug.com/38700.
     ownerFrame().frame()->document()->clearFocusedElement();
   }
 
   IntRect activeMatchRect;
-  IntRect activeMatchBoundingBox = enclosingIntRect(
-      LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()));
+  IntRect activeMatchBoundingBox =
+      enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(
+          EphemeralRange(m_activeMatch.get())));
 
   if (!activeMatchBoundingBox.isEmpty()) {
     if (m_activeMatch->firstNode() &&
         m_activeMatch->firstNode()->layoutObject()) {
       m_activeMatch->firstNode()->layoutObject()->scrollRectToVisible(
           LayoutRect(activeMatchBoundingBox),
           ScrollAlignment::alignCenterIfNeeded,
           ScrollAlignment::alignCenterIfNeeded, UserScroll);
     }
 
@@ skipping 119 matching lines @@
 
 DEFINE_TRACE(TextFinder) {
   visitor->trace(m_ownerFrame);
   visitor->trace(m_activeMatch);
   visitor->trace(m_resumeScopingFromRange);
   visitor->trace(m_deferredScopingWork);
   visitor->trace(m_findMatchesCache);
 }
 
 }  // namespace blink