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 ee655ceb6c46a3b6be73f73e6e2b3c317a6bea58..10f0f2b8b835ead28a96eb19b54f662024b8f25c 100644 |
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp |
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp |
@@ -1536,9 +1536,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under "text" (use TextMatch since Composition markers don't |
// persist across editing operations) |
EphemeralRange marker_range = PlainTextRange(8, 12).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
yosin_UTC9
2017/05/23 09:35:04
Could you move IMCTest.cpp changes into another pa
|
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Delete "Initial" |
Vector<CompositionUnderline> empty_underlines; |
Controller().SetCompositionFromExistingText(empty_underlines, 0, 7); |
@@ -1565,9 +1564,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under " text" (use TextMatch since Composition markers don't |
// persist across editing operations) |
EphemeralRange marker_range = PlainTextRange(7, 12).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Delete "Initial" |
Vector<CompositionUnderline> empty_underlines; |
Controller().SetCompositionFromExistingText(empty_underlines, 0, 7); |
@@ -1594,9 +1592,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under "text " (use TextMatch since Composition markers don't |
// persist across editing operations) |
EphemeralRange marker_range = PlainTextRange(8, 13).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Delete "Initial" |
Vector<CompositionUnderline> empty_underlines; |
Controller().SetCompositionFromExistingText(empty_underlines, 0, 7); |
@@ -1623,9 +1620,8 @@ TEST_F(InputMethodControllerTest, |
// Add marker under " text " (use TextMatch since Composition markers don't |
// persist across editing operations) |
EphemeralRange marker_range = PlainTextRange(7, 13).CreateRange(*div); |
- GetDocument().Markers().AddMarker(marker_range.StartPosition(), |
- marker_range.EndPosition(), |
- DocumentMarker::kTextMatch); |
+ GetDocument().Markers().AddTextMatchMarker( |
+ marker_range, DocumentMarker::MatchStatus::kInactive); |
// Delete "Initial" |
Vector<CompositionUnderline> empty_underlines; |
@@ -1651,9 +1647,8 @@ TEST_F(InputMethodControllerTest, Marker_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; |
@@ -1675,9 +1670,8 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextContainsStartOfMarker) { |
// 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; |
@@ -1698,9 +1692,8 @@ TEST_F(InputMethodControllerTest, Marker_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; |
@@ -1722,9 +1715,8 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextContainsEndOfMarker) { |
// 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; |
@@ -1747,9 +1739,8 @@ TEST_F(InputMethodControllerTest, Marker_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; |
@@ -1770,9 +1761,8 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextWithMarkerAtBeginning) { |
// 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()); |
@@ -1791,9 +1781,8 @@ TEST_F(InputMethodControllerTest, Marker_ReplaceTextWithMarkerAtEnd) { |
// 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()); |
@@ -1812,29 +1801,24 @@ TEST_F(InputMethodControllerTest, Marker_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()); |
@@ -1865,9 +1849,8 @@ TEST_F(InputMethodControllerTest, Marker_DeleteExactlyOnMarker) { |
"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()); |
@@ -1884,9 +1867,8 @@ TEST_F(InputMethodControllerTest, Marker_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; |
@@ -1905,19 +1887,16 @@ TEST_F(InputMethodControllerTest, Marker_InsertInMarkerInterior) { |
"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()); |
@@ -1944,19 +1923,16 @@ TEST_F(InputMethodControllerTest, Marker_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()); |