Get rid of findPlainText() with Range parameter

Source/core/editing/iterators/CharacterIterator.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 529 matching lines @@
 
     size_t newSize = size - (matchStart + 1);
     memmove(m_buffer.data(), m_buffer.data() + matchStart + 1, newSize * sizeof(UChar));
     m_prefixLength -= std::min<size_t>(m_prefixLength, matchStart + 1);
     m_buffer.shrink(newSize);
 
     start = size - matchStart;
     return matchedLength;
 }
 
-static PassRefPtrWillBeRawPtr<Range> collapsedToBoundary(const Range* range, bool forward)
-{
-    RefPtrWillBeRawPtr<Range> result = range->cloneRange();
-    result->collapse(!forward);
-    return result.release();
-}
-
 // Check if there's any unpaird surrogate code point.
 // Non-character code points are not checked.
 static bool isValidUTF16(const String& s)
 {
     if (s.is8Bit())
         return true;
     const UChar* ustr = s.characters16();
     size_t length = s.length();
     size_t position = 0;
     while (position < length) {
@@ skipping 48 matching lines @@
             buffer.reachedBreak();
             goto tryAgain;
         }
     }
 
     return matchLength;
 }
 
 static const TextIteratorBehaviorFlags iteratorFlagsForFindPlainText = TextIteratorEntersTextControls | TextIteratorEntersOpenShadowRoots | TextIteratorDoesNotBreakAtReplacedElement;
 
-PassRefPtrWillBeRawPtr<Range> findPlainText(const Range* range, const String& target, FindOptions options)
-{
-    // First, find the text.
-    size_t matchStart;
-    size_t matchLength;
-    {
-        CharacterIterator findIterator(range, iteratorFlagsForFindPlainText);
-        matchLength = findPlainTextInternal(findIterator, target, options, matchStart);
-        if (!matchLength)
-            return collapsedToBoundary(range, !(options & Backwards));
-    }
-
-    // Then, find the document position of the start and the end of the text.
-    CharacterIterator computeRangeIterator(range, iteratorFlagsForFindPlainText);
-    Position resultStart;
-    Position resultEnd;
-    computeRangeIterator.calculateCharacterSubrange(matchStart, matchLength, resultStart, resultEnd);
-    return Range::create(range->ownerDocument(), resultStart, resultEnd);
-}
-
 void findPlainText(const Position& inputStart, const Position& inputEnd, const String& target, FindOptions options, Position& resultStart, Position& resultEnd)
 {
     resultStart.clear();
     resultEnd.clear();
     // CharacterIterator requires layoutObjects to be up-to-date.
     if (!inputStart.inDocument())
         return;
     ASSERT(inputStart.document() == inputEnd.document());
 
     // FIXME: Reduce the code duplication with above (but how?).
     size_t matchStart;
     size_t matchLength;
     {
         CharacterIterator findIterator(inputStart, inputEnd, iteratorFlagsForFindPlainText);
         matchLength = findPlainTextInternal(findIterator, target, options, matchStart);
         if (!matchLength) {
             const Position& collapseTo = options & Backwards ? inputStart : inputEnd;
             resultStart = collapseTo;
             resultEnd = collapseTo;
             return;
         }
     }
 
     CharacterIterator computeRangeIterator(inputStart, inputEnd, iteratorFlagsForFindPlainText);
     computeRangeIterator.calculateCharacterSubrange(matchStart, matchLength, resultStart, resultEnd);
 }
 
 } // namespace blink