Restart search in page when new text is found.

third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 656 matching lines @@
 
             updateMarkerRenderedRect(node, **marker);
         }
     }
 
     // repaint the affected node
     if (docDirty && node->layoutObject())
         node->layoutObject()->setShouldDoFullPaintInvalidation();
 }
 
-void DocumentMarkerController::setMarkersActive(Range* range, bool active)
+bool DocumentMarkerController::setMarkersActive(Range* range, bool active)
 {
-    if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
-        return;
+    if (!possiblyHasMarkers(DocumentMarker::AllMarkers())) {
+        if (active) {
+            addTextMatchMarker(range, true);
+            return false;
+        }
+    }

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

On the face of it, this looks a bit weird -- adding a marker but returning
false. I'm trying to wrap my head around why this is needed (been a long time
since I looked at the DocumentMarkerController class).

Can you fill me in? Maybe a comment would be in order?

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

At first I thought to add markers here when there are no appropriate markers.
Thanks for comments, I've realized that it's better not to add them, since they
will be added on search restart.

     ASSERT(!m_markers.isEmpty());
 
     Node* startContainer = range->startContainer();
     Node* endContainer = range->endContainer();
 
     Node* pastLastNode = range->pastLastNode();
 
+    bool markerFound = false;
     for (Node* node = range->firstNode(); node != pastLastNode; node = NodeTraversal::next(*node)) {
         int startOffset = node == startContainer ? range->startOffset() : 0;
         int endOffset = node == endContainer ? range->endOffset() : INT_MAX;
-        setMarkersActive(node, startOffset, endOffset, active);
+        markerFound |= setMarkersActive(node, startOffset, endOffset, active);
     }
+    if (!markerFound && active) {
+        addTextMatchMarker(range, true);
+        return false;
+    }
+    return true;
 }
 
-void DocumentMarkerController::setMarkersActive(Node* node, unsigned startOffset, unsigned endOffset, bool active)
+bool DocumentMarkerController::setMarkersActive(Node* node, unsigned startOffset, unsigned endOffset, bool active)
 {
     MarkerLists* markers = m_markers.get(node);
     if (!markers)
-        return;
+        return false;
 
     bool docDirty = false;
     OwnPtrWillBeMember<MarkerList>& list = (*markers)[MarkerTypeToMarkerIndex(DocumentMarker::TextMatch)];
     if (!list)
-        return;
+        return true;

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

Out of curiosity... why not return false here?

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

Agree, fixed.

     MarkerList::iterator startPos = std::upper_bound(list->begin(), list->end(), startOffset, endsBefore);
     for (MarkerList::iterator marker = startPos; marker != list->end(); ++marker) {
 
         // Markers are returned in order, so stop if we are now past the specified range.
         if ((*marker)->startOffset() >= endOffset)
             break;
 
         (*marker)->setActiveMatch(active);
         docDirty = true;
     }
 
     // repaint the affected node
     if (docDirty && node->layoutObject())
         node->layoutObject()->setShouldDoFullPaintInvalidation();
+    return true;
 }
 
 #ifndef NDEBUG
 void DocumentMarkerController::showMarkers() const
 {
     fprintf(stderr, "%d nodes have markers:\n", m_markers.size());
     MarkerMap::const_iterator end = m_markers.end();
     for (MarkerMap::const_iterator nodeIterator = m_markers.begin(); nodeIterator != end; ++nodeIterator) {
         const Node* node = nodeIterator->key;
         fprintf(stderr, "%p", node);
@@ skipping 13 matching lines @@
 
 } // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller)
 {
     if (controller)
         controller->showMarkers();
 }
 #endif