Refactor TextFinder::scopeStringMatches().

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 52 matching lines @@
 DEFINE_TRACE(TextFinder::FindMatch) {
   visitor->trace(m_range);
 }
 
 class TextFinder::DeferredScopeStringMatches
     : public GarbageCollectedFinalized<TextFinder::DeferredScopeStringMatches> {
  public:
   static DeferredScopeStringMatches* create(TextFinder* textFinder,
                                             int identifier,
                                             const WebString& searchText,
-                                            const WebFindOptions& options,
-                                            bool reset) {
+                                            const WebFindOptions& options) {
     return new DeferredScopeStringMatches(textFinder, identifier, searchText,
-                                          options, reset);
+                                          options);
   }
 
   DEFINE_INLINE_TRACE() { visitor->trace(m_textFinder); }
 
   void dispose() { m_timer.stop(); }
 
  private:
   DeferredScopeStringMatches(TextFinder* textFinder,
                              int identifier,
                              const WebString& searchText,
-                             const WebFindOptions& options,
-                             bool reset)
+                             const WebFindOptions& options)
       : m_timer(this, &DeferredScopeStringMatches::doTimeout),
         m_textFinder(textFinder),
         m_identifier(identifier),
         m_searchText(searchText),
-        m_options(options),
-        m_reset(reset) {
+        m_options(options) {
     m_timer.startOneShot(0.0, BLINK_FROM_HERE);
   }
 
   void doTimeout(TimerBase*) {
-    m_textFinder->callScopeStringMatches(this, m_identifier, m_searchText,
-                                         m_options, m_reset);
+    m_textFinder->resumeScopingStringMatches(m_identifier, m_searchText,
+                                             m_options);
   }
 
   Timer<DeferredScopeStringMatches> m_timer;
   Member<TextFinder> m_textFinder;
   const int m_identifier;
   const WebString m_searchText;
   const WebFindOptions m_options;
-  const bool m_reset;
 };
 
 bool TextFinder::find(int identifier,
                       const WebString& searchText,
                       const WebFindOptions& options,
                       bool wrapWithinFrame,
                       bool* activeNow) {
   if (!options.findNext)
     unmarkAllTextMatches();
   else
@@ skipping 137 matching lines @@
         endObject, AXObjectCache::AXNotification::AXChildrenChanged);
 
   if (ownerFrame().client()) {
     ownerFrame().client()->handleAccessibilityFindInPageResult(
         identifier, m_activeMatchIndex + 1, WebAXObject(startObject),
         m_activeMatch->startOffset(), WebAXObject(endObject),
         m_activeMatch->endOffset());
   }
 }
 
+void TextFinder::startScopingStringMatches(int identifier,
+                                           const WebString& searchText,
+                                           const WebFindOptions& options) {
+  cancelPendingScopingEffort();
+
+  // This is a brand new search, so we need to reset everything.
+  // Scoping is just about to begin.
+  m_scopingInProgress = true;
+
+  // Need to keep the current identifier locally in order to finish the
+  // request in case the frame is detached during the process.
+  m_findRequestIdentifier = identifier;
+
+  // Clear highlighting for this frame.
+  unmarkAllTextMatches();
+
+  // Clear the tickmarks and results cache.
+  clearFindMatchesCache();
+
+  // Clear the total match count and increment markers version.
+  resetMatchCount();
+
+  // Clear the counters from last operation.
+  m_lastMatchCount = 0;
+  m_nextInvalidateAfter = 0;
+  m_resumeScopingFromRange = nullptr;
+
+  // The view might be null on detached frames.
+  LocalFrame* frame = ownerFrame().frame();
+  if (frame && frame->page())
+    m_frameScoping = true;
+
+  // Now, defer scoping until later to allow find operation to finish quickly.
+  scopeStringMatchesSoon(identifier, searchText, options);
+}
+
 void TextFinder::scopeStringMatches(int identifier,
                                     const WebString& searchText,
-                                    const WebFindOptions& options,
-                                    bool reset) {
-  // TODO(dglazkov): The reset/continue cases need to be untangled into two
-  // separate functions. This collation of logic is unnecessary and adds to
-  // overall complexity of the code.
-  if (reset) {
-    // This is a brand new search, so we need to reset everything.
-    // Scoping is just about to begin.
-    m_scopingInProgress = true;
-
-    // Need to keep the current identifier locally in order to finish the
-    // request in case the frame is detached during the process.
-    m_findRequestIdentifier = identifier;
-
-    // Clear highlighting for this frame.
-    unmarkAllTextMatches();
-
-    // Clear the tickmarks and results cache.
-    clearFindMatchesCache();
-
-    // Clear the counters from last operation.
-    m_lastMatchCount = 0;
-    m_nextInvalidateAfter = 0;
-    m_resumeScopingFromRange = nullptr;
-
-    // The view might be null on detached frames.
-    LocalFrame* frame = ownerFrame().frame();
-    if (frame && frame->page())
-      m_frameScoping = true;
-
-    // Now, defer scoping until later to allow find operation to finish quickly.
-    scopeStringMatchesSoon(
-        identifier, searchText, options,
-        false);  // false means just reset, so don't do it again.
-    return;
-  }
-
+                                    const WebFindOptions& options) {
   if (!shouldScopeMatches(searchText, options)) {
     finishCurrentScopingEffort(identifier);
     return;
   }
 
   PositionInFlatTree searchStart =
       PositionInFlatTree::firstPositionInNode(ownerFrame().frame()->document());
   PositionInFlatTree searchEnd =
       PositionInFlatTree::lastPositionInNode(ownerFrame().frame()->document());
   DCHECK_EQ(searchStart.document(), searchEnd.document());
@@ skipping 107 matching lines @@
   }
 
   if (timedOut) {
     // If we found anything during this pass, we should redraw. However, we
     // don't want to spam too much if the page is extremely long, so if we
     // reach a certain point we start throttling the redraw requests.
     if (matchCount > 0)
       invalidateIfNecessary();
 
     // Scoping effort ran out of time, lets ask for another time-slice.
-    scopeStringMatchesSoon(identifier, searchText, options,
-                           false);  // don't reset.
+    scopeStringMatchesSoon(identifier, searchText, options);
     return;                         // Done for now, resume work later.
   }
 
   finishCurrentScopingEffort(identifier);
 }
 
 void TextFinder::flushCurrentScopingEffort(int identifier) {
   if (!ownerFrame().frame() || !ownerFrame().frame()->page())
     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();
+  if (m_deferredScopingWork) {
+    m_deferredScopingWork->dispose();
+    m_deferredScopingWork.clear();
+  }
 
   m_activeMatchIndex = -1;
 
   // Last request didn't complete.
   if (m_scopingInProgress)
     m_lastFindRequestCompletedWithNoMatches = false;
 
   m_scopingInProgress = false;
 }
 
@@ skipping 252 matching lines @@
 
     if (previousSearchPrefix == m_lastSearchString)
       return false;  // Don't search this frame, it will be fruitless.
   }
 
   return true;
 }
 
 void TextFinder::scopeStringMatchesSoon(int identifier,
                                         const WebString& searchText,
-                                        const WebFindOptions& options,
-                                        bool reset) {
-  m_deferredScopingWork.append(DeferredScopeStringMatches::create(
-      this, identifier, searchText, options, reset));
+                                        const WebFindOptions& options) {
+  DCHECK_EQ(m_deferredScopingWork, nullptr);
+  m_deferredScopingWork =
+      DeferredScopeStringMatches::create(this, identifier, searchText, options);
 }
 
-void TextFinder::callScopeStringMatches(DeferredScopeStringMatches* caller,
-                                        int identifier,
-                                        const WebString& searchText,
-                                        const WebFindOptions& options,
-                                        bool reset) {
-  size_t index = m_deferredScopingWork.find(caller);
-  m_deferredScopingWork.remove(index);
+void TextFinder::resumeScopingStringMatches(int identifier,
+                                            const WebString& searchText,
+                                            const WebFindOptions& options) {
+  m_deferredScopingWork.clear();
 
-  scopeStringMatches(identifier, searchText, options, reset);
+  scopeStringMatches(identifier, searchText, options);
 }
 
 void TextFinder::invalidateIfNecessary() {
   if (m_lastMatchCount <= m_nextInvalidateAfter)
     return;
 
   // FIXME: (http://crbug.com/6819) Optimize the drawing of the tickmarks and
   // remove this. This calculation sets a milestone for when next to
   // invalidate the scrollbar and the content area. We do this so that we
   // don't spend too much time drawing the scrollbar over and over again.
@@ skipping 14 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