[WIP] Refactor DocumentMarker

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 16 matching lines @@
  */
 
 #include "core/editing/markers/DocumentMarkerController.h"
 
 #include <algorithm>
 #include "core/dom/Node.h"
 #include "core/dom/NodeTraversal.h"
 #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"
 #include "core/layout/LayoutObject.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 DocumentMarkerController::DocumentMarkerController(Document& document)
     : m_document(&document) {
   setContext(&document);
 }
 
 void DocumentMarkerController::clear() {
   for (DocumentMarker::MarkerType type : DocumentMarker::AllMarkers()) {
     MarkerMap& markerMap = markerMapForType(type);
     markerMap.clear();
   }
 }
 
 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));
   }
 }
 
 void DocumentMarkerController::addTextMatchMarker(const EphemeralRange& range,
                                                   bool activeMatch) {
   DCHECK(!m_document->needsLayoutTreeUpdate());
 
   // Use a TextIterator to visit the potentially multiple nodes the range
@@ skipping 12 matching lines @@
 void DocumentMarkerController::addCompositionMarker(const Position& start,
                                                     const Position& end,
                                                     Color underlineColor,
                                                     bool thick,
                                                     Color backgroundColor) {
   DCHECK(!m_document->needsLayoutTreeUpdate());
 
   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));
   }
 }
 
 void DocumentMarkerController::prepareForDestruction() {
   clear();
 }
 
 void DocumentMarkerController::removeMarkers(
     const EphemeralRange& range,
     DocumentMarker::MarkerTypes markerTypes,
@@ skipping 466 matching lines @@
 }
 
 }  // namespace blink
 
 #ifndef NDEBUG
 void showDocumentMarkers(const blink::DocumentMarkerController* controller) {
   if (controller)
     controller->showMarkers();
 }
 #endif