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

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

Issue 2724333002: Get rid of VisibleSelection::firstRangeOf() (Closed)
Patch Set: 2017-03-02T16:51:41 Created 3 years, 10 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
Index: third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
index 0b2fe466b9269423061422419cbc6a2e733475ee..0913fd38f8196f73158023773de2d3574af066a3 100644
--- a/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
+++ b/third_party/WebKit/Source/core/editing/VisibleSelectionTest.cpp
@@ -208,7 +208,7 @@ TEST_F(VisibleSelectionTest, Initialisation) {
EXPECT_TRUE(selection.isCaret());
EXPECT_TRUE(selectionInFlatTree.isCaret());
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(0u, range->startOffset());
EXPECT_EQ(0u, range->endOffset());
EXPECT_EQ("", range->text());
@@ -350,7 +350,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(0u, range->startOffset());
EXPECT_EQ(5u, range->endOffset());
EXPECT_EQ("Lorem", range->text());
@@ -366,7 +366,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(6u, range->startOffset());
EXPECT_EQ(11u, range->endOffset());
EXPECT_EQ("ipsum", range->text());
@@ -384,7 +384,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(5u, range->startOffset());
EXPECT_EQ(6u, range->endOffset());
EXPECT_EQ(" ", range->text());
@@ -402,7 +402,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(26u, range->startOffset());
EXPECT_EQ(27u, range->endOffset());
EXPECT_EQ(",", range->text());
@@ -418,7 +418,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(27u, range->startOffset());
EXPECT_EQ(28u, range->endOffset());
EXPECT_EQ(" ", range->text());
@@ -434,7 +434,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(0u, range->startOffset());
EXPECT_EQ(5u, range->endOffset());
EXPECT_EQ("Lorem", range->text());
@@ -450,7 +450,7 @@ TEST_F(VisibleSelectionTest, WordGranularity) {
selectionInFlatTree =
expandUsingGranularity(selectionInFlatTree, WordGranularity);
- Range* range = firstRangeOf(selection);
+ Range* range = createRange(firstEphemeralRangeOf(selection));
EXPECT_EQ(0u, range->startOffset());
EXPECT_EQ(11u, range->endOffset());
EXPECT_EQ("Lorem ipsum", range->text());

Powered by Google App Engine
This is Rietveld 408576698