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 51e99bb491512113701661d32b004bd768a839dc..2e3e6345fd5570b39e0fc785b68373085c9dc3ad 100644 |
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp |
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp |
@@ -1525,9 +1525,8 @@ TEST_F(InputMethodControllerTest, ContentDependentMarker_ReplaceStartOfMarker) { |
// Add marker under "Initial text" |
EphemeralRange marker_range = PlainTextRange(0, 12).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Replace "Initial" with "Original" |
Vector<CompositionUnderline> empty_underlines; |
@@ -1546,9 +1545,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under "initial text" |
EphemeralRange marker_range = PlainTextRange(13, 25).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Replace "some initial" with "boring" |
Vector<CompositionUnderline> empty_underlines; |
@@ -1565,9 +1563,8 @@ TEST_F(InputMethodControllerTest, ContentDependentMarker_ReplaceEndOfMarker) { |
// Add marker under "Initial text" |
EphemeralRange marker_range = PlainTextRange(0, 12).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Replace "text" with "string" |
Vector<CompositionUnderline> empty_underlines; |
@@ -1586,9 +1583,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under "some initial" |
EphemeralRange marker_range = PlainTextRange(8, 20).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Replace "initial text" with "content" |
Vector<CompositionUnderline> empty_underlines; |
@@ -1607,9 +1603,8 @@ TEST_F(InputMethodControllerTest, ContentDependentMarker_ReplaceEntireMarker) { |
// Add marker under "text" |
EphemeralRange marker_range = PlainTextRange(8, 12).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Replace "text" with "string" |
Vector<CompositionUnderline> empty_underlines; |
@@ -1627,9 +1622,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under "Initial" |
EphemeralRange marker_range = PlainTextRange(0, 7).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
EXPECT_EQ(1u, GetDocument().Markers().Markers().size()); |
@@ -1649,9 +1643,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under "text" |
EphemeralRange marker_range = PlainTextRange(8, 12).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
EXPECT_EQ(1u, GetDocument().Markers().Markers().size()); |
@@ -1670,29 +1663,24 @@ TEST_F(InputMethodControllerTest, ContentDependentMarker_Deletions) { |
"sample"); |
EphemeralRange marker_range = PlainTextRange(0, 5).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(5, 10).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(10, 15).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(15, 20).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(20, 25).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
EXPECT_EQ(5u, GetDocument().Markers().Markers().size()); |
@@ -1718,9 +1706,8 @@ TEST_F(InputMethodControllerTest, |
"sample"); |
EphemeralRange marker_range = PlainTextRange(5, 10).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
EXPECT_EQ(1u, GetDocument().Markers().Markers().size()); |
@@ -1737,9 +1724,8 @@ TEST_F(InputMethodControllerTest, ContentDependentMarker_DeleteMiddleOfMarker) { |
"sample"); |
EphemeralRange marker_range = PlainTextRange(5, 10).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Delete middle of marker |
Vector<CompositionUnderline> empty_underlines; |
@@ -1757,19 +1743,16 @@ TEST_F(InputMethodControllerTest, |
"sample"); |
EphemeralRange marker_range = PlainTextRange(0, 5).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(5, 10).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(10, 15).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
EXPECT_EQ(3u, GetDocument().Markers().Markers().size()); |
@@ -1793,19 +1776,16 @@ TEST_F(InputMethodControllerTest, ContentDependentMarker_InsertBetweenMarkers) { |
"sample"); |
EphemeralRange marker_range = PlainTextRange(0, 5).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(5, 15).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
marker_range = PlainTextRange(15, 20).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
EXPECT_EQ(3u, GetDocument().Markers().Markers().size()); |