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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2763893002: [WIP] Clean up DocumentMarkerController API (Closed)
Patch Set: 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/dom/Document.cpp ('k') | third_party/WebKit/Source/core/editing/markers/DocumentMarker.h » ('j') | third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h » ('J')
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 382433bdc65d1a5df0acb92e64899cc1cac8d15f..fac26ae8b33e5c5fe9ebd5e88fba9b7200f4125e 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
+++ b/third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp
@@ -1464,9 +1464,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.startPosition(),
+ markerRange.endPosition(), false);
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
@@ -1496,9 +1495,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.startPosition(),
+ markerRange.endPosition(), false);
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
@@ -1524,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, 13).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange.startPosition(),
+ markerRange.endPosition(), false);
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
controller().setCompositionFromExistingText(emptyUnderlines, 0, 7);
@@ -1552,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, 13).createRange(*div);
- document().markers().addMarker(markerRange.startPosition(),
- markerRange.endPosition(),
- DocumentMarker::TextMatch);
+ document().markers().addTextMatchMarker(markerRange.startPosition(),
+ markerRange.endPosition(), false);
// Delete "Initial"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1579,9 +1575,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
// Replace "Initial" with "Original"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1602,9 +1597,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
// Replace "some initial" with "boring"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1624,9 +1618,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
// Replace "text" with "string"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1647,9 +1640,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
// Replace "initial text" with "content"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1671,9 +1663,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
// Replace "text" with "string"
Vector<CompositionUnderline> emptyUnderlines;
@@ -1693,9 +1684,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
EXPECT_EQ(1u, document().markers().markers().size());
@@ -1714,9 +1704,8 @@ 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.startPosition(),
+ markerRange.endPosition(), false);
EXPECT_EQ(1u, document().markers().markers().size());
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/editing/markers/DocumentMarker.h » ('j') | third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698