[DMC #1.915] Refactor DocumentMarkerController::RemoveMarkers(const MarkerRemoverPredicate&)

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

 /*
  * 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 27 matching lines @@
 #include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutObject.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
-MarkerRemoverPredicate::MarkerRemoverPredicate(const Vector<String>& words)
-    : words_(words) {}
-
-bool MarkerRemoverPredicate::operator()(const DocumentMarker& document_marker,
-                                        const Text& text_node) const {
-  unsigned start = document_marker.StartOffset();
-  unsigned length = document_marker.EndOffset() - document_marker.StartOffset();
-
-  String marker_text = text_node.data().Substring(start, length);
-  return words_.Contains(marker_text);
-}
-
 namespace {
 
 DocumentMarker::MarkerTypeIndex MarkerTypeToMarkerIndex(
     DocumentMarker::MarkerType type) {
   switch (type) {
     case DocumentMarker::kSpelling:
       return DocumentMarker::kSpellingMarkerIndex;
     case DocumentMarker::kGrammar:
       return DocumentMarker::kGrammarMarkerIndex;
     case DocumentMarker::kTextMatch:
@@ skipping 421 matching lines @@
     DocumentMarker::MarkerTypes marker_types) {
   if (!PossiblyHasMarkers(marker_types))
     return;
   DCHECK(!markers_.IsEmpty());
 
   MarkerMap::iterator iterator = markers_.Find(node);
   if (iterator != markers_.end())
     RemoveMarkersFromList(iterator, marker_types);
 }
 
-void DocumentMarkerController::RemoveMarkers(
-    const MarkerRemoverPredicate& should_remove_marker) {
+void DocumentMarkerController::RemoveSpellingMarkersUnderWords(
+    const Vector<String>& words) {
   for (auto& node_markers : markers_) {
     const Node& node = *node_markers.key;
     if (!node.IsTextNode())  // MarkerRemoverPredicate requires a Text node.
       continue;
     MarkerLists* markers = node_markers.value;
     for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {

[Xiaocheng, 2017/04/21 05:40:32]

Just noticed that this function is wrong... It removes all markers, not just
spelling.

Anyway, it's out of scope. I filed crbug.com/713995 for it.

       Member<MarkerList>& list = ListForType(markers, type);
       if (!list)
         continue;
       bool removed_markers = false;
       for (size_t j = list->size(); j > 0; --j) {
-        if (should_remove_marker(*list->at(j - 1),
-                                 static_cast<const Text&>(node))) {
+        const DocumentMarker& marker = *list->at(j - 1);
+
+        unsigned start = marker.StartOffset();

[yosin_UTC9, 2017/04/21 08:29:33]

nit: s/unsigned/const unsigned/

+        unsigned length = marker.EndOffset() - marker.StartOffset();

[yosin_UTC9, 2017/04/21 08:29:33]

nit: s/unsigned/const unsigned/

+
+        String marker_text = ToText(node).data().Substring(start, length);

[yosin_UTC9, 2017/04/21 08:29:33]

nit: s/String/const String&/

+        if (words.Contains(marker_text)) {
           list->erase(j - 1);
           removed_markers = true;
         }
       }
       if (removed_markers && type == DocumentMarker::kTextMatch)
         InvalidatePaintForTickmarks(node);
     }
   }
 }
 
@@ skipping 219 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->ShowMarkers();
 }
 #endif