[WIP] Refactor DocumentMarker

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

Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
index aab6aebd02efde231634dc324bff117ad697d85d..4d74ac886e419d8dddf290df278481316084ceac 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp
@@ -34,9 +34,11 @@
 #include "core/dom/Range.h"
 #include "core/dom/Text.h"
 #include "core/editing/iterators/TextIterator.h"
+#include "core/editing/markers/CompositionMarker.h"
 #include "core/editing/markers/CompositionMarkerList.h"
 #include "core/editing/markers/DocumentMarkerList.h"
 #include "core/editing/markers/EditingMarkerList.h"
+#include "core/editing/markers/SpellCheckMarker.h"
 #include "core/editing/markers/SpellCheckMarkerList.h"
 #include "core/editing/markers/TextMatchMarkerList.h"
 #include "core/frame/FrameView.h"
@@ -64,13 +66,12 @@ void DocumentMarkerController::addMarker(const Position& start,
                                          const Position& end,
                                          DocumentMarker::MarkerType type,
                                          const String& description) {
-  DCHECK(type != DocumentMarker::TextMatch);

[Xiaocheng, 2017/03/29 23:40:11]

nit: no need to remove this check.

[rlanday, 2017/03/31 01:34:53]

SpellCheckMarker already DCHECKs that the type being passed in is either
Spelling or Grammar, so I think it's redundant

[Xiaocheng, 2017/03/31 02:01:01]

Makes sense.

   // Use a TextIterator to visit the potentially multiple nodes the range
   // covers.
   for (TextIterator markedText(start, end); !markedText.atEnd();
        markedText.advance()) {
     addMarker(markedText.currentContainer(),
-              new DocumentMarker(
+              new SpellCheckMarker(
                   type, markedText.startOffsetInCurrentContainer(),
                   markedText.endOffsetInCurrentContainer(), description));
   }
@@ -103,9 +104,9 @@ void DocumentMarkerController::addCompositionMarker(const Position& start,
   for (TextIterator markedText(start, end); !markedText.atEnd();
        markedText.advance()) {
     addMarker(markedText.currentContainer(),
-              new DocumentMarker(markedText.startOffsetInCurrentContainer(),
-                                 markedText.endOffsetInCurrentContainer(),
-                                 underlineColor, thick, backgroundColor));
+              new CompositionMarker(markedText.startOffsetInCurrentContainer(),
+                                    markedText.endOffsetInCurrentContainer(),
+                                    underlineColor, thick, backgroundColor));
   }
 }