Refactor TextFinder::scopeStringMatches().

third_party/WebKit/Source/web/TextFinder.h

 /*
  * 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 54 matching lines @@
             bool wrapWithinFrame,
             bool* activeNow = nullptr);
   void clearActiveFindMatch();
   void stopFindingAndClearSelection();
   void increaseMatchCount(int identifier, int count);
   int findMatchMarkersVersion() const { return m_findMatchMarkersVersion; }
   WebFloatRect activeFindMatchRect();
   void findMatchRects(WebVector<WebFloatRect>&);
   int selectNearestFindMatch(const WebFloatPoint&, WebRect* selectionRect);
 
-  // Counts how many times a particular string occurs within the frame.  It
-  // also retrieves the location of the string and updates a vector in the
-  // frame so that tick-marks and highlighting can be drawn.  This function
-  // does its work asynchronously, by running for a certain time-slice and
-  // then scheduling itself (co-operative multitasking) to be invoked later
-  // (repeating the process until all matches have been found).  This allows
-  // multiple frames to be searched at the same time and provides a way to
-  // cancel at any time (see cancelPendingScopingEffort).  The parameter
-  // searchText specifies what to look for and |reset| signals whether this is
-  // a brand new request or a continuation of the last scoping effort.
-  void scopeStringMatches(int identifier,
-                          const WebString& searchText,
-                          const WebFindOptions&,
-                          bool reset);
+  // Starts brand new scoping request: resets the scoping state and
+  // asyncronously calls scopeStringMatches().
+  void startScopingStringMatches(int identifier,
+                                 const WebString& searchText,
+                                 const WebFindOptions&);
 
   // Cancels any outstanding requests for scoping string matches on the frame.
   void cancelPendingScopingEffort();
 
   // This function is called to reset the total number of matches found during
   // the scoping effort.
   void resetMatchCount();
 
   // Return the index in the find-in-page cache of the match closest to the
   // provided point in find-in-page coordinates, or -1 in case of error.
@@ skipping 81 matching lines @@
 
   // Removes the current frame from the global scoping effort and triggers any
   // updates if appropriate. This method does not mark the scoping operation
   // as finished.
   void flushCurrentScopingEffort(int identifier);
 
   // Finishes the current scoping effort and triggers any updates if
   // appropriate.
   void finishCurrentScopingEffort(int identifier);
 
+  // Counts how many times a particular string occurs within the frame.  It
+  // also retrieves the location of the string and updates a vector in the
+  // frame so that tick-marks and highlighting can be drawn.  This function
+  // does its work asynchronously, by running for a certain time-slice and
+  // then scheduling itself (co-operative multitasking) to be invoked later
+  // (repeating the process until all matches have been found).  This allows
+  // multiple frames to be searched at the same time and provides a way to
+  // cancel at any time (see cancelPendingScopingEffort).  The parameter
+  // searchText specifies what to look for.
+  void scopeStringMatches(int identifier,
+                          const WebString& searchText,
+                          const WebFindOptions&);
+
   // Queue up a deferred call to scopeStringMatches.
   void scopeStringMatchesSoon(int identifier,
                               const WebString& searchText,
-                              const WebFindOptions&,
-                              bool reset);
+                              const WebFindOptions&);
 
   // Called by a DeferredScopeStringMatches instance.
-  void callScopeStringMatches(DeferredScopeStringMatches*,
-                              int identifier,
-                              const WebString& searchText,
-                              const WebFindOptions&,
-                              bool reset);
+  void resumeScopingStringMatches(int identifier,
+                                  const WebString& searchText,
+                                  const WebFindOptions&);
 
   // Determines whether to invalidate the content area and scrollbar.
   void invalidateIfNecessary();
 
   WebLocalFrameImpl& ownerFrame() const {
     DCHECK(m_ownerFrame);
     return *m_ownerFrame;
   }
 
   Member<WebLocalFrameImpl> m_ownerFrame;
@@ skipping 35 matching lines @@
   bool m_frameScoping;
 
   // Identifier of the latest find-in-page request. Required to be stored in
   // the frame in order to reply if required in case the frame is detached.
   int m_findRequestIdentifier;
 
   // Keeps track of when the scoping effort should next invalidate the scrollbar
   // and the frame area.
   int m_nextInvalidateAfter;
 
-  // A list of all of the pending calls to scopeStringMatches.
-  HeapVector<Member<DeferredScopeStringMatches>> m_deferredScopingWork;
+  // Pending call to scopeStringMatches.
+  Member<DeferredScopeStringMatches> m_deferredScopingWork;
 
   // Version number incremented whenever this frame's find-in-page match
   // markers change.
   int m_findMatchMarkersVersion;
 
   // Local cache of the find match markers currently displayed for this frame.
   HeapVector<FindMatch> m_findMatchesCache;
 
   // Contents size when find-in-page match rects were last computed for this
   // frame's cache.
@@ skipping 14 matching lines @@
   // Determines if the rects in the find-in-page matches cache of this frame
   // are invalid and should be recomputed.
   bool m_findMatchRectsAreValid;
 };
 
 }  // namespace blink
 
 WTF_ALLOW_INIT_WITH_MEM_FUNCTIONS(blink::TextFinder::FindMatch);
 
 #endif  // TextFinder_h