[WIP] Clean up DocumentMarkerController API

third_party/WebKit/Source/core/testing/Internals.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 944 matching lines @@
   }
 
   WTF::Optional<DocumentMarker::MarkerType> type = markerTypeFrom(markerType);
   if (!type) {
     exceptionState.throwDOMException(
         SyntaxError,
         "The marker type provided ('" + markerType + "') is invalid.");
     return;
   }
 
+  // Grammar and Spelling markers are the only marker types that can be set with
+  // just a range
+  if (type != DocumentMarker::Grammar && type != DocumentMarker::Spelling) {
+    exceptionState.throwDOMException(
+        SyntaxError,
+        "Marker of type '" + markerType +
+            "' was provided; type must be either Grammar or Spelling.");
+    return;
+  }
+
   document->updateStyleAndLayoutIgnorePendingStylesheets();
-  document->markers().addMarker(range->startPosition(), range->endPosition(),
-                                type.value());
+
+  if (type == DocumentMarker::Grammar) {
+    document->markers().addGrammarMarker(range->startPosition(),
+                                         range->endPosition());
+  } else {
+    document->markers().addSpellingMarker(range->startPosition(),
+                                          range->endPosition());
+  }
 }
 
 unsigned Internals::markerCountForNode(Node* node,
                                        const String& markerType,
                                        ExceptionState& exceptionState) {
   DCHECK(node);
   WTF::Optional<DocumentMarker::MarkerTypes> markerTypes =
       markerTypesFrom(markerType);
   if (!markerTypes) {
     exceptionState.throwDOMException(
@@ skipping 67 matching lines @@
     return String();
   return marker->description();
 }
 
 void Internals::addTextMatchMarker(const Range* range, bool isActive) {
   DCHECK(range);
   if (!range->ownerDocument().view())
     return;
 
   range->ownerDocument().updateStyleAndLayoutIgnorePendingStylesheets();
-  range->ownerDocument().markers().addTextMatchMarker(EphemeralRange(range),
-                                                      isActive);
+  range->ownerDocument().markers().addTextMatchMarker(
+      range->startPosition(), range->endPosition(), isActive);
 
   // This simulates what the production code does after
   // DocumentMarkerController::addTextMatchMarker().
   range->ownerDocument().view()->invalidatePaintForTickmarks();
 }
 
 static bool parseColor(const String& value,
                        Color& color,
                        ExceptionState& exceptionState,
                        String errorMessage) {
@@ skipping 22 matching lines @@
         range->startPosition(), range->endPosition(), underlineColor, thick,
         backgroundColor);
   }
 }
 
 void Internals::setMarkersActive(Node* node,
                                  unsigned startOffset,
                                  unsigned endOffset,
                                  bool active) {
   DCHECK(node);
-  node->document().markers().setMarkersActive(node, startOffset, endOffset,
-                                              active);
+  node->document().markers().setTextMatchMarkersActive(node, startOffset,
+                                                       endOffset, active);
 }
 
 void Internals::setMarkedTextMatchesAreHighlighted(Document* document,
                                                    bool highlight) {
   if (!document || !document->frame())
     return;
 
   document->frame()->editor().setMarkedTextMatchesAreHighlighted(highlight);
 }
 
@@ skipping 2115 matching lines @@
 
 void Internals::crash() {
   CHECK(false) << "Intentional crash";
 }
 
 void Internals::setIsLowEndDevice(bool isLowEndDevice) {
   MemoryCoordinator::setIsLowEndDeviceForTesting(isLowEndDevice);
 }
 
 }  // namespace blink