Removed limitation on searching frames for the same string prefix.

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 390 matching lines @@
     // since findPlainText will use a TextIterator to go over the visible
     // text nodes.
     searchStart = result.endPosition();
 
     m_resumeScopingFromRange = Range::create(
         result.document(), toPositionInDOMTree(result.endPosition()),
         toPositionInDOMTree(result.endPosition()));
     timedOut = (currentTime() - startTime) >= maxScopingDuration;
   } while (!timedOut);
 
-  // Remember what we search for last time, so we can skip searching if more
-  // letters are added to the search string (and last outcome was 0).
-  m_lastSearchString = searchText;
-
   if (matchCount > 0) {
     ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(true);
 
     m_lastMatchCount += matchCount;
 
     // Let the frame know how many matches we found during this pass.
     ownerFrame().increaseMatchCount(matchCount, identifier);
   }
 
   if (timedOut) {
@@ skipping 17 matching lines @@
     return;
 
   m_frameScoping = false;
   ownerFrame().increaseMatchCount(0, identifier);
 }
 
 void TextFinder::finishCurrentScopingEffort(int identifier) {
   flushCurrentScopingEffort(identifier);
 
   m_scopingInProgress = false;
-  m_lastFindRequestCompletedWithNoMatches = !m_lastMatchCount;
 
   // This frame is done, so show any scrollbar tickmarks we haven't drawn yet.
   ownerFrame().frameView()->invalidatePaintForTickmarks();
 }
 
 void TextFinder::cancelPendingScopingEffort() {
   for (DeferredScopeStringMatches* deferredWork : m_deferredScopingWork)
     deferredWork->dispose();
   m_deferredScopingWork.clear();
 
   m_activeMatchIndex = -1;
 
-  // Last request didn't complete.
-  if (m_scopingInProgress)
-    m_lastFindRequestCompletedWithNoMatches = false;
-
   m_scopingInProgress = false;
 }
 
 void TextFinder::increaseMatchCount(int identifier, int count) {
   if (count)
     ++m_findMatchMarkersVersion;
 
   m_totalMatchCount += count;
 
   // Update the UI with the latest findings.
@@ skipping 191 matching lines @@
       m_activeMatchIndex(-1),
       m_resumeScopingFromRange(nullptr),
       m_lastMatchCount(-1),
       m_totalMatchCount(-1),
       m_frameScoping(false),
       m_findRequestIdentifier(-1),
       m_nextInvalidateAfter(0),
       m_findMatchMarkersVersion(0),
       m_locatingActiveRect(false),
       m_scopingInProgress(false),
-      m_lastFindRequestCompletedWithNoMatches(false),
       m_findMatchRectsAreValid(false) {}
 
 TextFinder::~TextFinder() {}
 
 bool TextFinder::setMarkerActive(Range* range, bool active) {
   if (!range || range->collapsed())
     return false;
   return ownerFrame().frame()->document()->markers().setMarkersActive(
       EphemeralRange(range), active);
 }
 
 void TextFinder::unmarkAllTextMatches() {
   LocalFrame* frame = ownerFrame().frame();
   if (frame && frame->page() &&
       frame->editor().markedTextMatchesAreHighlighted())
     frame->document()->markers().removeMarkers(DocumentMarker::TextMatch);
 }
 
 bool TextFinder::shouldScopeMatches(const String& searchText,
                                     const WebFindOptions& options) {
   // Don't scope if we can't find a frame or a view.
   // The user may have closed the tab/application, so abort.
   LocalFrame* frame = ownerFrame().frame();
   if (!frame || !frame->view() || !frame->page())
     return false;
 
   DCHECK(frame->document());
   DCHECK(frame->view());
 
-  if (options.force)
-    return true;
-
-  if (!ownerFrame().hasVisibleContent())
-    return false;
-
-  // If the frame completed the scoping operation and found 0 matches the last
-  // time it was searched, then we don't have to search it again if the user is
-  // just adding to the search string or sending the same search string again.
-  if (m_lastFindRequestCompletedWithNoMatches &&
-      !m_lastSearchString.isEmpty()) {
-    // Check to see if the search string prefixes match.
-    String previousSearchPrefix =
-        searchText.substring(0, m_lastSearchString.length());
-
-    if (previousSearchPrefix == m_lastSearchString)
-      return false;  // Don't search this frame, it will be fruitless.
-  }
-
-  return true;
+  return options.force || ownerFrame().hasVisibleContent();
 }
 
 void TextFinder::scopeStringMatchesSoon(int identifier,
                                         const WebString& searchText,
                                         const WebFindOptions& options,
                                         bool reset) {
   m_deferredScopingWork.append(DeferredScopeStringMatches::create(
       this, identifier, searchText, options, reset));
 }
 
@@ skipping 33 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