[DMC #4] Add CompositionMarkerListImpl

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 931f6e7b208f7af8e26bd48d29f342c413489220..0e23593766962c11d7b8bb844db704ffee0dff20 100644
--- a/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/markers/DocumentMarkerControllerTest.cpp
@@ -57,7 +57,6 @@ class DocumentMarkerControllerTest : public ::testing::Test {
 
   Text* CreateTextNode(const char*);
   void MarkNodeContents(Node*);
-  void MarkNodeContentsWithComposition(Node*);
   void SetBodyInnerHTML(const char*);
 
  private:
@@ -77,16 +76,6 @@ void DocumentMarkerControllerTest::MarkNodeContents(Node* node) {
                                DocumentMarker::kSpelling);
 }
 
-void DocumentMarkerControllerTest::MarkNodeContentsWithComposition(Node* node) {
-  // Force layoutObjects to be created; TextIterator, which is used in
-  // DocumentMarkerControllerTest::addMarker(), needs them.
-  GetDocument().UpdateStyleAndLayout();
-  auto range = EphemeralRange::RangeOfContents(*node);
-  MarkerController().AddCompositionMarker(range.StartPosition(),
-                                          range.EndPosition(), Color::kBlack,
-                                          false, Color::kBlack);
-}
-
 void DocumentMarkerControllerTest::SetBodyInnerHTML(const char* body_content) {
   GetDocument().body()->setInnerHTML(String::FromUTF8(body_content));
 }
@@ -217,22 +206,6 @@ TEST_F(DocumentMarkerControllerTest, UpdateRenderedRects) {
   EXPECT_NE(rendered_rects[0], new_rendered_rects[0]);
 }
 
-TEST_F(DocumentMarkerControllerTest, UpdateRenderedRectsForComposition) {

[Xiaocheng, 2017/04/26 14:17:53]

Why removing this test?

[rlanday, 2017/04/26 20:33:24]

There was an earlier version of this CL where I made CompositionMarkerList
not create the RenderedDocumentMarkers, at which point this test was
testing something that was no longer supported. We're still planning to
make this change, but in a later CL. So I can leave the test in for now,
but it's testing for something we're actually planning on removing.

[Xiaocheng, 2017/04/26 22:20:36]

Oh, it's calling UpdateRenderedRects on composition markers.

Fine with removing it.

[rlanday, 2017/04/26 22:27:59]

Just to clarify for anyone else reading this: there's already a second copy of
the
test case called UpdateRenderedRects(); right now it uses a Spelling marker, but
I'm
changing it to create a TextMatch marker (the only type we really care about the
rendered rects for) in https://codereview.chromium.org/2829543002

-  SetBodyInnerHTML("<div style='margin: 100px'>foo</div>");
-  Element* div = ToElement(GetDocument().body()->firstChild());
-  MarkNodeContentsWithComposition(div);
-  Vector<IntRect> rendered_rects =
-      MarkerController().RenderedRectsForMarkers(DocumentMarker::kComposition);
-  EXPECT_EQ(1u, rendered_rects.size());
-
-  div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
-  GetDocument().UpdateStyleAndLayout();
-  Vector<IntRect> new_rendered_rects =
-      MarkerController().RenderedRectsForMarkers(DocumentMarker::kComposition);
-  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();