[DMC #1.913] Rename DocumentMarkerController::RemoveMarkers() to RemoveMarkersOfTypes()

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 214 matching lines @@
 void TextFinder::ClearActiveFindMatch() {
   current_active_match_frame_ = false;
   SetMarkerActive(active_match_.Get(), false);
   ResetActiveMatch();
 }
 
 void TextFinder::StopFindingAndClearSelection() {
   CancelPendingScopingEffort();
 
   // Remove all markers for matches found and turn off the highlighting.
-  OwnerFrame().GetFrame()->GetDocument()->Markers().RemoveMarkers(
+  OwnerFrame().GetFrame()->GetDocument()->Markers().RemoveMarkersOfTypes(
       DocumentMarker::kTextMatch);
   OwnerFrame().GetFrame()->GetEditor().SetMarkedTextMatchesAreHighlighted(
       false);
   ClearFindMatchesCache();
   ResetActiveMatch();
 
   // Let the frame know that we don't want tickmarks anymore.
   OwnerFrame().GetFrameView()->InvalidatePaintForTickmarks();
 }
 
@@ skipping 456 matching lines @@
 bool TextFinder::SetMarkerActive(Range* range, bool active) {
   if (!range || range->collapsed())
     return false;
   return OwnerFrame().GetFrame()->GetDocument()->Markers().SetMarkersActive(
       EphemeralRange(range), active);
 }
 
 void TextFinder::UnmarkAllTextMatches() {
   LocalFrame* frame = OwnerFrame().GetFrame();
   if (frame && frame->GetPage() &&
-      frame->GetEditor().MarkedTextMatchesAreHighlighted())
-    frame->GetDocument()->Markers().RemoveMarkers(DocumentMarker::kTextMatch);
+      frame->GetEditor().MarkedTextMatchesAreHighlighted()) {
+    frame->GetDocument()->Markers().RemoveMarkersOfTypes(
+        DocumentMarker::kTextMatch);
+  }
 }
 
 bool TextFinder::ShouldScopeMatches(const String& search_text,
                                     const WebFindOptions& options) {
   // Don't scope if we can't find a frame or a view.
   // The user may have closed the tab/application, so abort.
   LocalFrame* frame = OwnerFrame().GetFrame();
   if (!frame || !frame->View() || !frame->GetPage())
     return false;
 
@@ skipping 63 matching lines @@
 
 DEFINE_TRACE(TextFinder) {
   visitor->Trace(owner_frame_);
   visitor->Trace(active_match_);
   visitor->Trace(resume_scoping_from_range_);
   visitor->Trace(deferred_scoping_work_);
   visitor->Trace(find_matches_cache_);
 }
 
 }  // namespace blink