Add DocumentMarker::MatchStatus enum for text match markers

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 98 matching lines @@
 };
 
 bool TextFinder::find(int identifier,
                       const WebString& searchText,
                       const WebFindOptions& options,
                       bool wrapWithinFrame,
                       bool* activeNow) {
   if (!options.findNext)
     unmarkAllTextMatches();
   else
-    setMarkerActive(m_activeMatch.get(), false);
+    setMarkerActive(m_activeMatch.get(), DocumentMarker::MatchStatus::Inactive);
 
   if (m_activeMatch &&
       &m_activeMatch->ownerDocument() != ownerFrame().frame()->document())
     m_activeMatch = nullptr;
 
   // If the user has selected something since the last Find operation we want
   // to start from there. Otherwise, we start searching from where the last Find
   // operation left off (either a Find or a FindNext operation).
   VisibleSelection selection(ownerFrame()
                                  .frame()
@@ skipping 37 matching lines @@
           ->pageNeedsAutosizing()) {
     ownerFrame().viewImpl()->zoomToFindInPageRect(
         ownerFrame().frameView()->contentsToRootFrame(
             enclosingIntRect(LayoutObject::absoluteBoundingBoxRectForRange(
                 m_activeMatch.get()))));
   }
 
   bool wasActiveFrame = m_currentActiveMatchFrame;
   m_currentActiveMatchFrame = true;
 
-  bool isActive = setMarkerActive(m_activeMatch.get(), true);
+  bool isActive =
+      setMarkerActive(m_activeMatch.get(), DocumentMarker::MatchStatus::Active);
   if (activeNow)
     *activeNow = isActive;
 
   // Make sure no node is focused. See http://crbug.com/38700.
   ownerFrame().frame()->document()->clearFocusedElement();
 
   // Set this frame as focused.
   ownerFrame().viewImpl()->setFocusedFrame(&ownerFrame());
 
   if (!options.findNext || activeSelection || !isActive) {
@@ skipping 27 matching lines @@
   }
 
   // We found something, so the result of the previous scoping may be outdated.
   m_lastFindRequestCompletedWithNoMatches = false;
 
   return true;
 }
 
 void TextFinder::clearActiveFindMatch() {
   m_currentActiveMatchFrame = false;
-  setMarkerActive(m_activeMatch.get(), false);
+  setMarkerActive(m_activeMatch.get(), DocumentMarker::MatchStatus::Inactive);
   resetActiveMatch();
 }
 
 void TextFinder::stopFindingAndClearSelection() {
   cancelPendingScopingEffort();
 
   // Remove all markers for matches found and turn off the highlighting.
   ownerFrame().frame()->document()->markers().removeMarkers(
       DocumentMarker::TextMatch);
   ownerFrame().frame()->editor().setMarkedTextMatchesAreHighlighted(false);
@@ skipping 154 matching lines @@
       // To stop looking for the active tickmark, we set this flag.
       m_locatingActiveRect = false;
 
       // Notify browser of new location for the selected rectangle.
       reportFindInPageSelection(
           ownerFrame().frameView()->contentsToRootFrame(resultBounds),
           m_activeMatchIndex + 1, identifier);
     }
 
     ownerFrame().frame()->document()->markers().addTextMatchMarker(
-        EphemeralRange(resultRange), foundActiveMatch);
+        EphemeralRange(resultRange),
+        foundActiveMatch ? DocumentMarker::MatchStatus::Active
+                         : DocumentMarker::MatchStatus::Inactive);
 
     m_findMatchesCache.push_back(
         FindMatch(resultRange, m_lastMatchCount + matchCount));
 
     // Set the new start for the search range to be the end of the previous
     // result range. There is no need to use a VisiblePosition here,
     // since findPlainText will use a TextIterator to go over the visible
     // text nodes.
     searchStart = result.endPosition();
 
@@ skipping 213 matching lines @@
 
   // Check if the match is already selected.
   if (!m_currentActiveMatchFrame || !m_activeMatch ||
       !areRangesEqual(m_activeMatch.get(), range)) {
     m_activeMatchIndex = m_findMatchesCache[index].m_ordinal - 1;
 
     // Set this frame as the active frame (the one with the active highlight).
     m_currentActiveMatchFrame = true;
     ownerFrame().viewImpl()->setFocusedFrame(&ownerFrame());
 
-    if (m_activeMatch)
-      setMarkerActive(m_activeMatch.get(), false);
+    if (m_activeMatch) {
+      setMarkerActive(m_activeMatch.get(),
+                      DocumentMarker::MatchStatus::Inactive);
+    }
     m_activeMatch = range;
-    setMarkerActive(m_activeMatch.get(), true);
+    setMarkerActive(m_activeMatch.get(), DocumentMarker::MatchStatus::Active);
 
     // Clear any user selection, to make sure Find Next continues on from the
     // match we just activated.
     ownerFrame().frame()->selection().clear();
 
     // Make sure no node is focused. See http://crbug.com/38700.
     ownerFrame().frame()->document()->clearFocusedElement();
   }
 
   IntRect activeMatchRect;
@@ skipping 36 matching lines @@
       m_findRequestIdentifier(-1),
       m_nextInvalidateAfter(0),
       m_findMatchMarkersVersion(0),
       m_locatingActiveRect(false),
       m_scopingInProgress(false),
       m_lastFindRequestCompletedWithNoMatches(false),
       m_findMatchRectsAreValid(false) {}
 
 TextFinder::~TextFinder() {}
 
-bool TextFinder::setMarkerActive(Range* range, bool active) {
+bool TextFinder::setMarkerActive(Range* range,
+                                 DocumentMarker::MatchStatus matchStatus) {
   if (!range || range->collapsed())
     return false;
   return ownerFrame().frame()->document()->markers().setMarkersActive(
-      EphemeralRange(range), active);
+      EphemeralRange(range), matchStatus);
 }
 
 void TextFinder::unmarkAllTextMatches() {
   LocalFrame* frame = ownerFrame().frame();
   if (frame && frame->page() &&
       frame->editor().markedTextMatchesAreHighlighted())
     frame->document()->markers().removeMarkers(DocumentMarker::TextMatch);
 }
 
 bool TextFinder::shouldScopeMatches(const String& searchText,
@@ skipping 70 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