Restart search in page when new text is found.

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 94 matching lines @@
     }
 
     Timer<DeferredScopeStringMatches> m_timer;
     RawPtrWillBeMember<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, WebRect* selectionRect)
+bool TextFinder::find(int identifier, const WebString& searchText, const WebFindOptions& options, bool wrapWithinFrame, WebRect* selectionRect, bool& newTextFound)
 {
     if (!ownerFrame().frame() || !ownerFrame().frame()->page())
         return false;
 
     WebLocalFrameImpl* mainFrameImpl = ownerFrame().viewImpl()->mainFrameImpl();
 
     if (!options.findNext)
         unmarkAllTextMatches();
     else
         setMarkerActive(m_activeMatch.get(), false);
@@ skipping 30 matching lines @@
         return false;
     }
 
     // If the user is browsing a page with autosizing, adjust the zoom to the
     // 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().frame()->document()->textAutosizer()->pageNeedsAutosizing()) {
         ownerFrame().viewImpl()->zoomToFindInPageRect(ownerFrame().frameView()->contentsToRootFrame(enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(m_activeMatch.get()))));
     }
 
-    setMarkerActive(m_activeMatch.get(), true);
+    newTextFound = !setMarkerActive(m_activeMatch.get(), true);
     WebLocalFrameImpl* oldActiveFrame = mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame;
     mainFrameImpl->ensureTextFinder().m_currentActiveMatchFrame = &ownerFrame();
 
     // Make sure no node is focused. See http://crbug.com/38700.
     ownerFrame().frame()->document()->clearFocusedElement();
 
-    if (!options.findNext || activeSelection) {
+    if (!options.findNext || activeSelection || newTextFound) {
         // This is either a Find operation or a Find-next from a new start point
         // due to a selection, so we set the flag to ask the scoping effort
         // to find the active rect for us and report it back to the UI.

[Finnur, 2016/01/20 14:14:03]

Nit: This comment would now need updating too.

[dvadym, 2016/01/29 09:44:17]

Done.

         m_locatingActiveRect = true;
     } else {
         if (oldActiveFrame != &ownerFrame()) {
             if (options.forward)
                 m_activeMatchIndexInCurrentFrame = 0;
             else
                 m_activeMatchIndexInCurrentFrame = m_lastMatchCount - 1;
         } else {
             if (options.forward)
                 ++m_activeMatchIndexInCurrentFrame;
@@ skipping 493 matching lines @@
 #if !ENABLE(OILPAN)
     cancelPendingScopingEffort();
 #endif
 }
 
 void TextFinder::addMarker(Range* range, bool activeMatch)
 {
     ownerFrame().frame()->document()->markers().addTextMatchMarker(range, activeMatch);
 }
 
-void TextFinder::setMarkerActive(Range* range, bool active)
+bool TextFinder::setMarkerActive(Range* range, bool active)
 {
     if (!range || range->collapsed())
-        return;
-    ownerFrame().frame()->document()->markers().setMarkersActive(range, active);
+        return true;

[Finnur, 2016/01/20 14:14:03]

Wait... why not return false?

[dvadym, 2016/01/29 09:44:17]

Done.

+    return ownerFrame().frame()->document()->markers().setMarkersActive(range, active);
 }
 
 void TextFinder::unmarkAllTextMatches()
 {
     LocalFrame* frame = ownerFrame().frame();
     if (frame && frame->page() && frame->editor().markedTextMatchesAreHighlighted()) {
         if (ownerFrame().client() && ownerFrame().client()->shouldSearchSingleFrame())
             frame->document()->markers().removeMarkers(DocumentMarker::TextMatch);
         else
             frame->page()->unmarkAllTextMatches();
@@ skipping 110 matching lines @@
     visitor->trace(m_ownerFrame);
     visitor->trace(m_currentActiveMatchFrame);
     visitor->trace(m_activeMatch);
     visitor->trace(m_resumeScopingFromRange);
     visitor->trace(m_deferredScopingWork);
     visitor->trace(m_findMatchesCache);
 #endif
 }
 
 } // namespace blink