Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

Issue 2723663002: Refactor DocumentMarkerController (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/editing/BUILD.gn ('k') | third_party/WebKit/Source/core/editing/markers/DocumentMarker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e151c8f0d1428c9c314cf1b622bcf97d34abf7aa..9a1a17e31dba45efce06ae35d161cc2dd06569ef 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -1522,9 +1522,8 @@ TEST_F(InputMethodControllerTest,
// 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);
+ document().markers().addTextMatchMarker(markerRange, false);
+
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
@@ -1550,9 +1549,8 @@ TEST_F(InputMethodControllerTest,
// 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);
+ document().markers().addTextMatchMarker(markerRange, false);
+
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
@@ -1578,9 +1576,8 @@ TEST_F(InputMethodControllerTest,
// 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);
+ document().markers().addTextMatchMarker(markerRange, false);
+
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
@@ -1606,9 +1603,7 @@ TEST_F(InputMethodControllerTest,
// 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);
+ document().markers().addTextMatchMarker(markerRange, false);
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1633,9 +1628,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceStartOfMarker) {
// Add marker under "Initial text"
EphemeralRange markerRange = PlainTextRange(0, 12).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Replace "Initial" with "Original"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1656,9 +1649,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextContainsStartOfMarker) {
// Add marker under "initial text"
EphemeralRange markerRange = PlainTextRange(13, 25).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Replace "some initial" with "boring"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1678,9 +1669,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceEndOfMarker) {
// Add marker under "Initial text"
EphemeralRange markerRange = PlainTextRange(0, 12).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Replace "text" with "string"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1701,9 +1690,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextContainsEndOfMarker) {
// Add marker under "some initial"
EphemeralRange markerRange = PlainTextRange(8, 20).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Replace "initial text" with "content"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1725,9 +1712,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceEntireMarker) {
// Add marker under "text"
EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Replace "text" with "string"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1747,9 +1732,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextWithMarkerAtBeginning) {
// Add marker under "Initial"
EphemeralRange markerRange = PlainTextRange(0, 7).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
EXPECT_EQ(1u, document().markers().markers().size());
@@ -1768,9 +1751,7 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextWithMarkerAtEnd) {
// Add marker under "text"
EphemeralRange markerRange = PlainTextRange(8, 12).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
EXPECT_EQ(1u, document().markers().markers().size());
@@ -1789,29 +1770,19 @@ TEST_F(InputMethodControllerTest, Marker_Deletions) {
"sample");
EphemeralRange markerRange = PlainTextRange(0, 5).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
markerRange = PlainTextRange(5, 10).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
markerRange = PlainTextRange(10, 15).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
markerRange = PlainTextRange(15, 20).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
markerRange = PlainTextRange(20, 25).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
EXPECT_EQ(5u, document().markers().markers().size());
@@ -1838,9 +1809,7 @@ TEST_F(InputMethodControllerTest, Marker_Deletions) {
document().markers().clear();
markerRange = PlainTextRange(5, 10).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Delete exactly on a marker
controller().setCompositionFromExistingText(emptyUnderlines, 5, 10);
@@ -1848,21 +1817,16 @@ TEST_F(InputMethodControllerTest, Marker_Deletions) {
EXPECT_EQ(0u, document().markers().markers().size());
markerRange = PlainTextRange(5, 10).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// Delete middle of marker
controller().setCompositionFromExistingText(emptyUnderlines, 6, 9);
controller().commitText(String(""), emptyUnderlines, 0);
- EXPECT_EQ(2u, document().markers().markers().size());
+ EXPECT_EQ(1u, document().markers().markers().size());
EXPECT_EQ(5u, document().markers().markers()[0]->startOffset());
- EXPECT_EQ(6u, document().markers().markers()[0]->endOffset());
-
- EXPECT_EQ(6u, document().markers().markers()[1]->startOffset());
- EXPECT_EQ(7u, document().markers().markers()[1]->endOffset());
+ EXPECT_EQ(7u, document().markers().markers()[0]->endOffset());
}
TEST_F(InputMethodControllerTest, Marker_Insertions) {
@@ -1871,19 +1835,13 @@ TEST_F(InputMethodControllerTest, Marker_Insertions) {
"sample");
EphemeralRange markerRange = PlainTextRange(0, 5).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
markerRange = PlainTextRange(5, 10).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
markerRange = PlainTextRange(10, 15).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange, false);
// insert in middle of second marker
Vector<CompositionUnderline> emptyUnderlines;
« no previous file with comments | « third_party/WebKit/Source/core/editing/BUILD.gn ('k') | third_party/WebKit/Source/core/editing/markers/DocumentMarker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698