[DMC #4] Add CompositionMarkerListImpl

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 39 matching lines @@
   DocumentMarkerControllerTest()
       : dummy_page_holder_(DummyPageHolder::Create(IntSize(800, 600))) {}
 
   Document& GetDocument() const { return dummy_page_holder_->GetDocument(); }
   DocumentMarkerController& MarkerController() const {
     return GetDocument().Markers();
   }
 
   Text* CreateTextNode(const char*);
   void MarkNodeContents(Node*);
-  void MarkNodeContentsWithComposition(Node*);
   void SetBodyInnerHTML(const char*);
 
  private:
   std::unique_ptr<DummyPageHolder> dummy_page_holder_;
 };
 
 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(),
                                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));
 }
 
 TEST_F(DocumentMarkerControllerTest, DidMoveToNewDocument) {
   SetBodyInnerHTML("<b><i>foo</i></b>");
   Element* parent = ToElement(GetDocument().body()->firstChild()->firstChild());
   MarkNodeContents(parent);
   EXPECT_EQ(1u, MarkerController().Markers().size());
   Persistent<Document> another_document = Document::Create();
@@ skipping 110 matching lines @@
   EXPECT_EQ(1u, rendered_rects.size());
 
   div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
   GetDocument().UpdateStyleAndLayout();
   Vector<IntRect> new_rendered_rects =
       MarkerController().RenderedRectsForMarkers(DocumentMarker::kSpelling);
   EXPECT_EQ(1u, new_rendered_rects.size());
   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();
   GetDocument().UpdateStyleAndLayout();
   MarkerController().AddCompositionMarker(Position(text, 0), Position(text, 1),
                                           Color::kBlack, false, Color::kBlack);
   MarkerController().AddCompositionMarker(Position(text, 1), Position(text, 3),
                                           Color::kBlack, true, Color::kBlack);
 
   EXPECT_EQ(2u, MarkerController().Markers().size());
@@ skipping 96 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