Refactor DocumentMarkerController

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

 /*
  * Copyright (c) 2013, Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 {
 
 class DocumentMarkerControllerTest : public ::testing::Test {
  protected:
   DocumentMarkerControllerTest()
       : m_dummyPageHolder(DummyPageHolder::create(IntSize(800, 600))) {}
 
   Document& document() const { return m_dummyPageHolder->document(); }
   DocumentMarkerController& markerController() const {
@@ skipping 12 matching lines @@
 Text* DocumentMarkerControllerTest::createTextNode(const char* textContents) {
   return document().createTextNode(String::fromUTF8(textContents));
 }
 
 void DocumentMarkerControllerTest::markNodeContents(Node* node) {
   // Force layoutObjects to be created; TextIterator, which is used in
   // DocumentMarkerControllerTest::addMarker(), needs them.
   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) {
   document().body()->setInnerHTML(String::fromUTF8(bodyContent));
 }
 
 TEST_F(DocumentMarkerControllerTest, DidMoveToNewDocument) {
   setBodyInnerHTML("<b><i>foo</i></b>");
   Element* parent = toElement(document().body()->firstChild()->firstChild());
   markNodeContents(parent);
@@ skipping 94 matching lines @@
   }
   // No more reference to marked node.
   ThreadState::current()->collectAllGarbage();
   EXPECT_EQ(0u, markerController().markers().size());
 }
 
 TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects) {
   setBodyInnerHTML("<div style='margin: 100px'>foo</div>");
   Element* div = toElement(document().body()->firstChild());
   markNodeContents(div);
-  Vector<IntRect> renderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Spelling);
+  Vector<IntRect> renderedRects = markerController().renderedRectsForMarkers();
   EXPECT_EQ(1u, renderedRects.size());
 
   div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
   document().updateStyleAndLayout();
   Vector<IntRect> newRenderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Spelling);
+      markerController().renderedRectsForMarkers();
   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);
-  EXPECT_EQ(1u, renderedRects.size());
-
-  div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
-  document().updateStyleAndLayout();
-  Vector<IntRect> newRenderedRects =
-      markerController().renderedRectsForMarkers(DocumentMarker::Composition);
-  EXPECT_EQ(1u, newRenderedRects.size());
-  EXPECT_NE(renderedRects[0], newRenderedRects[0]);
-}
 
 TEST_F(DocumentMarkerControllerTest, CompositionMarkersNotMerged) {
   setBodyInnerHTML("<div style='margin: 100px'>foo</div>");
   Node* text = document().body()->firstChild()->firstChild();
   document().updateStyleAndLayout();
   markerController().addCompositionMarker(Position(text, 0), Position(text, 1),
                                           Color::black, false, Color::black);
   markerController().addCompositionMarker(Position(text, 1), Position(text, 3),
                                           Color::black, true, Color::black);
 
@@ skipping 11 matching lines @@
   // Try to make active a marker that doesn't exist.
   EXPECT_FALSE(markerController().setMarkersActive(range, true));
 
   // Add a marker and try it once more.
   markerController().addTextMatchMarker(range, false);
   EXPECT_EQ(1u, markerController().markers().size());
   EXPECT_TRUE(markerController().setMarkersActive(range, true));
 }
 
 }  // namespace blink