[DMC #5] Add SpellCheckMarkerListImpl

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 54 matching lines @@
 
 Text* DocumentMarkerControllerTest::CreateTextNode(const char* text_contents) {
   return GetDocument().createTextNode(String::FromUTF8(text_contents));
 }
 
 void DocumentMarkerControllerTest::MarkNodeContents(Node* node) {
   // Force layoutObjects to be created; TextIterator, which is used in
   // DocumentMarkerControllerTest::addMarker(), needs them.
   GetDocument().UpdateStyleAndLayout();
   auto range = EphemeralRange::RangeOfContents(*node);
-  MarkerController().AddMarker(range.StartPosition(), range.EndPosition(),

[Xiaocheng, 2017/04/27 22:04:38]

Are these the only sites creating markers of wrong types?

It seems better to clean up all of them in a separate patch.

[rlanday, 2017/04/27 22:22:23]

No, these are actually correctly creating Spelling markers, but we actually want
TextMatch
markers because those are eventually going to be the only ones with
RenderedRects. We
could do this later (when we get rid of the RenderedRects in the non-TextMatch
marker list
impls) if we want.

-                               DocumentMarker::kSpelling);
+  MarkerController().AddTextMatchMarker(range,
+                                        DocumentMarker::MatchStatus::kInactive);
 }
 
 void DocumentMarkerControllerTest::SetBodyInnerHTML(const char* body_content) {
   GetDocument().body()->setInnerHTML(String::FromUTF8(body_content));
 }
 
 TEST_F(DocumentMarkerControllerTest, DidMoveToNewDocument) {
   SetBodyInnerHTML("<b><i>foo</i></b>");
   Element* parent = ToElement(GetDocument().body()->firstChild()->firstChild());
   MarkNodeContents(parent);
@@ skipping 101 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(GetDocument().body()->firstChild());
   MarkNodeContents(div);
   Vector<IntRect> rendered_rects =
-      MarkerController().RenderedRectsForMarkers(DocumentMarker::kSpelling);
+      MarkerController().RenderedRectsForMarkers(DocumentMarker::kTextMatch);
   EXPECT_EQ(1u, rendered_rects.size());
 
   div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
   GetDocument().UpdateStyleAndLayout();
   Vector<IntRect> new_rendered_rects =
-      MarkerController().RenderedRectsForMarkers(DocumentMarker::kSpelling);
+      MarkerController().RenderedRectsForMarkers(DocumentMarker::kTextMatch);
   EXPECT_EQ(1u, new_rendered_rects.size());
   EXPECT_NE(rendered_rects[0], new_rendered_rects[0]);
 }
 
 TEST_F(DocumentMarkerControllerTest, CompositionMarkersNotMerged) {
   SetBodyInnerHTML("<div style='margin: 100px'>foo</div>");
   Node* text = GetDocument().body()->firstChild()->firstChild();
   GetDocument().UpdateStyleAndLayout();
   MarkerController().AddCompositionMarker(Position(text, 0), Position(text, 1),
                                           Color::kBlack, false, Color::kBlack);
@@ skipping 100 matching lines @@
 
   // RemoveSpellingMarkersUnderWords does not remove text match marker.
   ASSERT_EQ(1u, MarkerController().Markers().size());
   const DocumentMarker& marker = *MarkerController().Markers()[0];
   EXPECT_EQ(0u, marker.StartOffset());
   EXPECT_EQ(3u, marker.EndOffset());
   EXPECT_EQ(DocumentMarker::kTextMatch, marker.GetType());
 }
 
 }  // namespace blink