Avoid style clobbering in setCompositionFromExistingText. (2nd land)

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 36 matching lines @@
 
 class DocumentMarkerControllerTest : public ::testing::Test {
 protected:
     void SetUp() override;
 
     Document& document() const { return *m_document; }
     DocumentMarkerController& markerController() const { return m_document->markers(); }
 
     PassRefPtrWillBeRawPtr<Text> createTextNode(const char*);
     void markNodeContents(PassRefPtrWillBeRawPtr<Node>);
+    void markNodeContentsWithComposition(PassRefPtrWillBeRawPtr<Node>);
     void setBodyInnerHTML(const char*);
 
 private:
     OwnPtr<DummyPageHolder> m_dummyPageHolder;
     RefPtrWillBePersistent<Document> m_document;
 };
 
 void DocumentMarkerControllerTest::SetUp()
 {
     m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     m_document = &m_dummyPageHolder->document();
     ASSERT(m_document);
 }
 
 PassRefPtrWillBeRawPtr<Text> DocumentMarkerControllerTest::createTextNode(const char* textContents)
 {
     return document().createTextNode(String::fromUTF8(textContents));
 }
 
 void DocumentMarkerControllerTest::markNodeContents(PassRefPtrWillBeRawPtr<Node> node)
 {
     // Force layoutObjects to be created; TextIterator, which is used in
     // DocumentMarkerControllerTest::addMarker(), needs them.
     document().updateLayout();
     auto range = EphemeralRange::rangeOfContents(*node);
     markerController().addMarker(range.startPosition(), range.endPosition(), DocumentMarker::Spelling);
 }
 
+void DocumentMarkerControllerTest::markNodeContentsWithComposition(PassRefPtrWillBeRawPtr<Node> node)
+{
+    // Force layoutObjects to be created; TextIterator, which is used in
+    // DocumentMarkerControllerTest::addMarker(), needs them.
+    document().updateLayout();
+    auto range = EphemeralRange::rangeOfContents(*node);
+    markerController().addCompositionMarker(range.startPosition(), range.endPosition(), Color::black, false, Color::black);
+}
+
 void DocumentMarkerControllerTest::setBodyInnerHTML(const char* bodyContent)
 {
     document().body()->setInnerHTML(String::fromUTF8(bodyContent), ASSERT_NO_EXCEPTION);
 }
 
 TEST_F(DocumentMarkerControllerTest, DidMoveToNewDocument)
 {
     setBodyInnerHTML("<b><i>foo</i></b>");
     RefPtrWillBeRawPtr<Element> parent = toElement(document().body()->firstChild()->firstChild());
     markNodeContents(parent.get());
@@ skipping 115 matching lines @@
     EXPECT_EQ(1u, renderedRects.size());
     EXPECT_NE(invalidRect, renderedRects[0]);
 
     div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
     document().updateLayout();
     Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarkers(DocumentMarker::Spelling);
     EXPECT_EQ(1u, newRenderedRects.size());
     EXPECT_NE(renderedRects[0], newRenderedRects[0]);
 }
 
+TEST_F(DocumentMarkerControllerTest, UpdateRenderedRectsForComposition)
+{
+    IntRect invalidRect(RenderedDocumentMarker::create(DocumentMarker(0, 0, false))->renderedRect());
+
+    setBodyInnerHTML("<div style='margin: 100px'>foo</div>");
+    RefPtrWillBeRawPtr<Element> div = toElement(document().body()->firstChild());
+    markNodeContentsWithComposition(div);
+    Vector<IntRect> renderedRects = markerController().renderedRectsForMarkers(DocumentMarker::Composition);
+    EXPECT_EQ(1u, renderedRects.size());
+    EXPECT_NE(invalidRect, renderedRects[0]);
+
+    div->setAttribute(HTMLNames::styleAttr, "margin: 200px");
+    document().updateLayout();
+    Vector<IntRect> newRenderedRects = markerController().renderedRectsForMarkers(DocumentMarker::Composition);
+    EXPECT_EQ(1u, newRenderedRects.size());
+    EXPECT_NE(renderedRects[0], newRenderedRects[0]);
+}
+
 } // namespace blink