Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp

Issue 1605863002: Restart search in page when new text is found. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added default value for local var Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
index fca8c4b22f930bce6b28cce39d2aefbb1c020086..b7211a656dbd2545f88cd1e0e822a0074767636e 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
@@ -674,10 +674,11 @@ void DocumentMarkerController::shiftMarkers(Node* node, unsigned startOffset, in
node->layoutObject()->setShouldDoFullPaintInvalidation();
}
-void DocumentMarkerController::setMarkersActive(Range* range, bool active)
+bool DocumentMarkerController::setMarkersActive(Range* range, bool active)
{
if (!possiblyHasMarkers(DocumentMarker::AllMarkers()))
- return;
+ return false;
+
ASSERT(!m_markers.isEmpty());
Node* startContainer = range->startContainer();
@@ -685,23 +686,25 @@ void DocumentMarkerController::setMarkersActive(Range* range, bool active)
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);
}
+ return markerFound;
}
-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 false;
MarkerList::iterator startPos = std::upper_bound(list->begin(), list->end(), startOffset, endsBefore);
for (MarkerList::iterator marker = startPos; marker != list->end(); ++marker) {
@@ -716,6 +719,7 @@ void DocumentMarkerController::setMarkersActive(Node* node, unsigned startOffset
// repaint the affected node
if (docDirty && node->layoutObject())
node->layoutObject()->setShouldDoFullPaintInvalidation();
+ return docDirty;
}
#ifndef NDEBUG

Powered by Google App Engine
This is Rietveld 408576698