Rewrite DocumentMarkerController to use SynchronousMutationObserver

third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

Index: third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
index 322e8367a663e6d78cfa4130f6ab1f462080a257..03fc3050089614adf7c29e0763665aa0b75968c3 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -1290,4 +1290,258 @@ TEST_F(InputMethodControllerTest, SelectionWhenFocusChangeFinishesComposition) {
                    .computeOffsetInContainerNode());
 }
 
+TEST_F(InputMethodControllerTest, WhitespaceFixupAroundMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under "text" (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the marker is still attached to "text" and doesn't include
+  // either space around it
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(1u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(5u, document().markers().markers()[0]->endOffset());

[yoichio, 2017/02/24 04:52:09]

It is not unclear what you check.
Could you add something like:
 ASSERT_EQUALS(div.innerText, "text");
 ASSERT_EQUALS(getMarkedText(document().markers(), 0), "text");
(you might need to impl |getMarkedText| function).

[rlanday, 2017/02/24 19:30:25]

I'm going to just add a helper function in the unit test; if we want to actually
add it to DocumentMarker, we'll have to do a bunch of plumbing to store a
pointer to the associated Node in each DocumentMarker and keep this up to date
when copying markers to other nodes, etc.

+}
+
+TEST_F(InputMethodControllerTest, WhitespaceFixupAroundMarker2) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under " text" (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(7, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // before "text" but not the space after
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  EXPECT_EQ(0u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(5u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, WhitespaceFixupAroundMarker3) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under "text " (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(8, 13).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the marker is still attached to "text " and includes the space
+  // after "text" but not the space before
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(1u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(6u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, WhitespaceFixupAroundMarker4) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text blah</div>", "sample");
+
+  // Add marker under " text " (use TextMatch since Composition markers don't
+  // persist across editing operations)
+  EphemeralRange markerRange = PlainTextRange(7, 13).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Delete "Initial"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Delete "blah"
+  controller().setCompositionFromExistingText(emptyUnderlines, 6, 10);
+  controller().commitText(String(""), emptyUnderlines, 0);
+
+  // Check that the marker is still attached to " text " and includes both the
+  // space before "text" and the space after
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(0u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(6u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceStartOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "Initial text"
+  EphemeralRange markerRange = PlainTextRange(0, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "Initial" with "Original"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
+  controller().commitText(String("Original"), emptyUnderlines, 0);
+
+  // Verify marker is under "Original text"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(0u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(13u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceBeforeAndAfterStartOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>This is some initial text</div>",
+      "sample");
+
+  // Add marker under "initial text"
+  EphemeralRange markerRange = PlainTextRange(13, 25).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "some initial" with "boring"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 20);
+  controller().commitText(String("boring"), emptyUnderlines, 0);
+
+  // Verify marker is under " text"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(14u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(19u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceEndOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "Initial text"
+  EphemeralRange markerRange = PlainTextRange(0, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "text" with "string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 12);
+  controller().commitText(String("string"), emptyUnderlines, 0);
+
+  // Verify marker is under "Initial string"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(0u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(14u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceBeforeAndAfterEndOfMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>This is some initial text</div>",
+      "sample");
+
+  // Add marker under "some initial"
+  EphemeralRange markerRange = PlainTextRange(8, 20).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "initial text" with "content"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 13, 25);
+  controller().commitText(String("content"), emptyUnderlines, 0);
+
+  // Verify marker is under "some "
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(8u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(13u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceEntireMarker) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "text"
+  EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  // Replace "text" with "string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 8, 12);
+  controller().commitText(String("string"), emptyUnderlines, 0);
+
+  // Verify marker is under "string"
+  EXPECT_EQ(1u, document().markers().markers().size());
+  EXPECT_EQ(8u, document().markers().markers()[0]->startOffset());
+  EXPECT_EQ(14u, document().markers().markers()[0]->endOffset());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceTextWithMarkerAtBeginning) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "Initial"
+  EphemeralRange markerRange = PlainTextRange(0, 7).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // Replace "Initial text" with "New string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 12);
+  controller().commitText(String("New string"), emptyUnderlines, 0);
+
+  // Verify marker was removed
+  EXPECT_EQ(0u, document().markers().markers().size());
+}
+
+TEST_F(InputMethodControllerTest, ReplaceTextWithMarkerAtEnd) {
+  Element* div = insertHTMLElement(
+      "<div id='sample' contenteditable>Initial text</div>", "sample");
+
+  // Add marker under "text"
+  EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
+  document().markers().addMarker(markerRange.startPosition(),
+                                 markerRange.endPosition(),
+                                 DocumentMarker::TextMatch);
+
+  EXPECT_EQ(1u, document().markers().markers().size());
+
+  // Replace "Initial text" with "New string"
+  Vector<CompositionUnderline> emptyUnderlines;
+  controller().setCompositionFromExistingText(emptyUnderlines, 0, 12);
+  controller().commitText(String("New string"), emptyUnderlines, 0);
+
+  // Verify marker was removed
+  EXPECT_EQ(0u, document().markers().markers().size());
+}
+
 }  // namespace blink