Adding a word to dictionary should remove spelling markers

Source/core/dom/DocumentMarkerController.cpp

Index: Source/core/dom/DocumentMarkerController.cpp
diff --git a/Source/core/dom/DocumentMarkerController.cpp b/Source/core/dom/DocumentMarkerController.cpp
index 5a7cc9b47afb89e7f4f28bc2d60120995ec16109..93c910ef6f05e3603687f58b100712b416fad8af 100644
--- a/Source/core/dom/DocumentMarkerController.cpp
+++ b/Source/core/dom/DocumentMarkerController.cpp
@@ -40,6 +40,21 @@
 
 namespace blink {
 
+MarkerRemoverPredicate::MarkerRemoverPredicate(Document& document,
+    const Vector<String>& words)
+    : m_document(document), m_words(words)
+{
+}
+
+bool MarkerRemoverPredicate::operator()(const DocumentMarker& documentMarker,
+    const Node* node) const {
+    RefPtr<Range> markerRange = Range::create(m_document,

[yosin_UTC9, 2014/08/12 01:18:08]

Let's avoid to use temporary Range object for Oilpan.
In Oilpan, Range object isn't destructed when we return from this function.
This means when we migrate Oilpan, DOM mutation is slower because of we need to
iterate over live Range objects.

Since, |node| is |Text|, we can use CharacterData::data().
So, let's make |operator()| to take |const Text*| instead of |const Node*|.

[yosin_UTC9, 2014/08/12 01:18:08]

nit: s/RefPtr/RefPtrWIllBeRawPtr/

[Klemen Forstnerič, 2014/08/12 18:38:02]

Done.

[Klemen Forstnerič, 2014/08/12 18:38:02]

I removed the Range altogether, so no need to this fix anymore :-)

+        const_cast<Node*>(node), documentMarker.startOffset(),
+        const_cast<Node*>(node), documentMarker.endOffset());
+
+    return m_words.contains(markerRange->text());
+}
+
 namespace {
 
 DocumentMarker::MarkerTypeIndex MarkerTypeToMarkerIndex(DocumentMarker::MarkerType type)
@@ -494,6 +509,25 @@ void DocumentMarkerController::removeMarkers(Node* node, DocumentMarker::MarkerT
         removeMarkersFromList(iterator, markerTypes);
 }
 
+void DocumentMarkerController::removeMarkers(const MarkerRemoverPredicate& shouldRemoveMarker)
+{
+    for (MarkerMap::iterator i = m_markers.begin(); i != m_markers.end(); ++i) {
+        MarkerLists* markers = i->value.get();
+        for (size_t markerListIndex = 0; markerListIndex < DocumentMarker::MarkerTypeIndexesCount; ++markerListIndex) {
+            OwnPtrWillBeMember<MarkerList>& list = (*markers)[markerListIndex];
+
+            Vector<RenderedDocumentMarker *> markersToBeRemoved;
+            for (size_t j = 0; list.get() && j < list->size(); ++j) {
+                if (shouldRemoveMarker(*list->at(j).get(), i->key))
+                    markersToBeRemoved.append(list->at(j).get());
+            }
+
+            for (size_t j = 0; j < markersToBeRemoved.size(); ++j)
+                list->remove(list->find(markersToBeRemoved[j]));
+        }
+    }
+}
+
 void DocumentMarkerController::removeMarkers(DocumentMarker::MarkerTypes markerTypes)
 {
     if (!possiblyHasMarkers(markerTypes))