[DMC #1.912] Rename DocumentMarkerController::RemoveMarkers() to RemoveMarkersInternal()

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

 /*
  * 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.
@@ skipping 61 matching lines @@
                             const Position& end,
                             Color underline_color,
                             bool thick,
                             Color background_color);
 
   void MoveMarkers(Node* src_node, int length, Node* dst_node);
 
   void PrepareForDestruction();
   void RemoveMarkersInRange(const EphemeralRange&, DocumentMarker::MarkerTypes);
   void RemoveMarkers(
-      Node*,
-      unsigned start_offset,
-      int length,
-      DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
-  void RemoveMarkers(
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void RemoveMarkers(
       Node*,
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   void RemoveMarkers(const MarkerRemoverPredicate& should_remove_marker);
   void RepaintMarkers(
       DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
   // Returns true if markers within a range are found.
   bool SetMarkersActive(const EphemeralRange&, bool);
   // Returns true if markers within a range defined by a node, |startOffset| and
@@ skipping 31 matching lines @@
   void AddMarker(Node*, const DocumentMarker&);
 
   using MarkerList = HeapVector<Member<RenderedDocumentMarker>>;
   using MarkerLists =
       HeapVector<Member<MarkerList>, DocumentMarker::kMarkerTypeIndexesCount>;
   using MarkerMap = HeapHashMap<WeakMember<const Node>, Member<MarkerLists>>;
   static Member<MarkerList>& ListForType(MarkerLists*,
                                          DocumentMarker::MarkerType);
   bool PossiblyHasMarkers(DocumentMarker::MarkerTypes);
   void RemoveMarkersFromList(MarkerMap::iterator, DocumentMarker::MarkerTypes);
   void RemoveMarkers(TextIterator&, DocumentMarker::MarkerTypes);

[rlanday, 2017/04/21 03:51:13]

We already have another private RemoveMarkers() method, should we rename this
one too? Can we come up with something better than calling them both
RemoveMarkersInternal()?

[Xiaocheng, 2017/04/21 05:22:46]

If this function is the sink called by all other functions, it's fine to call it
RemoveMarkersInternal. It's the other private function that needs renaming.

Btw, this function doesn't need default parameter. Please add a TODO for
cleanup.

[rlanday, 2017/04/21 05:28:15]

I decided to just remove the default param in this CL (I'm also doing this in
the other renaming CLs, I just missed it here).

I think this method is correctly named as RemoveMarkersInternal(), the other one
should be something like RemoveMarkersForTextIterator()...

+  void RemoveMarkersInternal(
+      Node*,
+      unsigned start_offset,
+      int length,
+      DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
 
   MarkerMap markers_;
   // Provide a quick way to determine whether a particular marker type is absent
   // without going through the map.
   DocumentMarker::MarkerTypes possibly_existing_marker_types_;
   const Member<const Document> document_;
 };
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController*);
 #endif
 
 #endif  // DocumentMarkerController_h