[WIP] Clean up DocumentMarkerController API

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 379 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);
+        resultRange->startPosition(), resultRange->endPosition(),
+        foundActiveMatch);
 
     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 276 matching lines @@
       m_locatingActiveRect(false),
       m_scopingInProgress(false),
       m_lastFindRequestCompletedWithNoMatches(false),
       m_findMatchRectsAreValid(false) {}
 
 TextFinder::~TextFinder() {}
 
 bool TextFinder::setMarkerActive(Range* range, bool active) {
   if (!range || range->collapsed())
     return false;
-  return ownerFrame().frame()->document()->markers().setMarkersActive(
+  return ownerFrame().frame()->document()->markers().setTextMatchMarkersActive(
       EphemeralRange(range), active);
 }
 
 void TextFinder::unmarkAllTextMatches() {
   LocalFrame* frame = ownerFrame().frame();
   if (frame && frame->page() &&
       frame->editor().markedTextMatchesAreHighlighted())
     frame->document()->markers().removeMarkers(DocumentMarker::TextMatch);
 }
 
@@ skipping 71 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