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 152 matching lines @@
   // 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()
           .GetFrame()
           ->GetDocument()
           ->GetTextAutosizer()
           ->PageNeedsAutosizing()) {
     OwnerFrame().ViewImpl()->ZoomToFindInPageRect(
         OwnerFrame().GetFrameView()->ContentsToRootFrame(
             EnclosingIntRect(LayoutObject::AbsoluteBoundingBoxRectForRange(
-                active_match_.Get()))));
+                EphemeralRange(active_match_.Get())))));
   }
 
   bool was_active_frame = current_active_match_frame_;
   current_active_match_frame_ = true;
 
   bool is_active = SetMarkerActive(active_match_.Get(), true);
   if (active_now)
     *active_now = is_active;
 
   // Make sure no node is focused. See http://crbug.com/38700.
@@ skipping 349 matching lines @@
     contents_size_for_current_find_match_rects_ = current_contents_size;
     find_match_rects_are_valid_ = false;
   }
 
   size_t dead_matches = 0;
   for (FindMatch& match : find_matches_cache_) {
     if (!match.range_->BoundaryPointsValid() ||
         !match.range_->startContainer()->isConnected())
       match.rect_ = FloatRect();
     else if (!find_match_rects_are_valid_)
-      match.rect_ = FindInPageRectFromRange(match.range_.Get());
+      match.rect_ = FindInPageRectFromRange(EphemeralRange(match.range_.Get()));
 
     if (match.rect_.IsEmpty())
       ++dead_matches;
   }
 
   // Remove any invalid matches from the cache.
   if (dead_matches) {
     HeapVector<FindMatch> filtered_matches;
     filtered_matches.ReserveCapacity(find_matches_cache_.size() - dead_matches);
 
@@ skipping 14 matching lines @@
           ->EnsureTextFinder()
           .find_match_rects_are_valid_ = false;
 
   find_match_rects_are_valid_ = true;
 }
 
 WebFloatRect TextFinder::ActiveFindMatchRect() {
   if (!current_active_match_frame_ || !active_match_)
     return WebFloatRect();
 
-  return WebFloatRect(FindInPageRectFromRange(ActiveMatch()));
+  return WebFloatRect(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
 }
 
 void TextFinder::FindMatchRects(WebVector<WebFloatRect>& output_rects) {
   UpdateFindMatchRects();
 
   Vector<WebFloatRect> match_rects;
   match_rects.ReserveCapacity(match_rects.size() + find_matches_cache_.size());
   for (const FindMatch& match : find_matches_cache_) {
     DCHECK(!match.rect_.IsEmpty());
     match_rects.push_back(match.rect_);
@@ skipping 58 matching lines @@
 
     // Clear any user selection, to make sure Find Next continues on from the
     // match we just activated.
     OwnerFrame().GetFrame()->Selection().Clear();
 
     // Make sure no node is focused. See http://crbug.com/38700.
     OwnerFrame().GetFrame()->GetDocument()->ClearFocusedElement();
   }
 
   IntRect active_match_rect;
-  IntRect active_match_bounding_box = EnclosingIntRect(
-      LayoutObject::AbsoluteBoundingBoxRectForRange(active_match_.Get()));
+  IntRect active_match_bounding_box =
+      EnclosingIntRect(LayoutObject::AbsoluteBoundingBoxRectForRange(
+          EphemeralRange(active_match_.Get())));
 
   if (!active_match_bounding_box.IsEmpty()) {
     if (active_match_->FirstNode() &&
         active_match_->FirstNode()->GetLayoutObject()) {
       active_match_->FirstNode()->GetLayoutObject()->ScrollRectToVisible(
           LayoutRect(active_match_bounding_box),
           ScrollAlignment::kAlignCenterIfNeeded,
           ScrollAlignment::kAlignCenterIfNeeded, kUserScroll);
     }
 
@@ skipping 124 matching lines @@
 
 DEFINE_TRACE(TextFinder) {
   visitor->Trace(owner_frame_);
   visitor->Trace(active_match_);
   visitor->Trace(resume_scoping_from_range_);
   visitor->Trace(deferred_scoping_work_);
   visitor->Trace(find_matches_cache_);
 }
 
 }  // namespace blink