Refactor DocumentMarkerController

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

Index: third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
index 366c8d1ec6ef658680b2ee8da88434523b9236ae..4649827b3a995ab8366e3b73fd6d03b76f439c60 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
@@ -30,18 +30,17 @@
 
 #include "core/editing/markers/DocumentMarkerController.h"
 
+#include <memory>
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/Range.h"
 #include "core/dom/Text.h"
 #include "core/editing/EphemeralRange.h"
-#include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/html/HTMLElement.h"
 #include "core/testing/DummyPageHolder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 
 namespace blink {
 
@@ -74,17 +73,7 @@ void DocumentMarkerControllerTest::markNodeContents(Node* node) {
   document().updateStyleAndLayout();
   auto range = EphemeralRange::rangeOfContents(*node);
   markerController().addMarker(range.startPosition(), range.endPosition(),
-                               DocumentMarker::Spelling);
-}
-
-void DocumentMarkerControllerTest::markNodeContentsWithComposition(Node* node) {
-  // Force layoutObjects to be created; TextIterator, which is used in
-  // DocumentMarkerControllerTest::addMarker(), needs them.
-  document().updateStyleAndLayout();
-  auto range = EphemeralRange::rangeOfContents(*node);
-  markerController().addCompositionMarker(range.startPosition(),
-                                          range.endPosition(), Color::black,
-                                          false, Color::black);
+                               DocumentMarker::TextMatch);
 }
 
 void DocumentMarkerControllerTest::setBodyInnerHTML(const char* bodyContent) {
@@ -200,29 +189,13 @@ TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects) {
   Element* div = toElement(document().body()->firstChild());
   markNodeContents(div);
   Vector<IntRect> renderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Spelling);
-  EXPECT_EQ(1u, renderedRects.size());
-
-  div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
-  document().updateStyleAndLayout();
-  Vector<IntRect> newRenderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Spelling);
-  EXPECT_EQ(1u, newRenderedRects.size());
-  EXPECT_NE(renderedRects[0], newRenderedRects[0]);
-}
-
-TEST_F(DocumentMarkerControllerTest, UpdateRenderedRectsForComposition) {
-  setBodyInnerHTML("<div style='margin: 100px'>foo</div>");
-  Element* div = toElement(document().body()->firstChild());
-  markNodeContentsWithComposition(div);
-  Vector<IntRect> renderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Composition);
+      markerController().renderedRectsForTextMatchMarkers();
   EXPECT_EQ(1u, renderedRects.size());
 
   div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
   document().updateStyleAndLayout();
   Vector<IntRect> newRenderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Composition);
+      markerController().renderedRectsForTextMatchMarkers();
   EXPECT_EQ(1u, newRenderedRects.size());
   EXPECT_NE(renderedRects[0], newRenderedRects[0]);
 }