| Index: third_party/WebKit/Source/core/editing/PositionIteratorTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/PositionIteratorTest.cpp b/third_party/WebKit/Source/core/editing/PositionIteratorTest.cpp
|
| index fe63644301e54415092b7d5de2267bb756e686ce..615d2aea52b2f82e25da7b773e68715acd9963f6 100644
|
| --- a/third_party/WebKit/Source/core/editing/PositionIteratorTest.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/PositionIteratorTest.cpp
|
| @@ -23,7 +23,7 @@ TEST_F(PositionIteratorTest, decrementWithInputElement) {
|
| EXPECT_EQ(Position::LastPositionInNode(GetDocument().body()),
|
| dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| - EXPECT_EQ(Position::AfterNode(input), dom_iterator.ComputePosition());
|
| + EXPECT_EQ(Position::AfterNode(*input), dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| EXPECT_EQ(Position::BeforeNode(*input), dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| @@ -37,7 +37,7 @@ TEST_F(PositionIteratorTest, decrementWithInputElement) {
|
| EXPECT_EQ(PositionInFlatTree::LastPositionInNode(GetDocument().body()),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Decrement();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(input),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*input),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Decrement();
|
| EXPECT_EQ(PositionInFlatTree::BeforeNode(*input),
|
| @@ -60,9 +60,9 @@ TEST_F(PositionIteratorTest, decrementWithSelectElement) {
|
| EXPECT_EQ(Position::LastPositionInNode(GetDocument().body()),
|
| dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| - EXPECT_EQ(Position::AfterNode(select), dom_iterator.ComputePosition());
|
| + EXPECT_EQ(Position::AfterNode(*select), dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| - EXPECT_EQ(Position::AfterNode(select), dom_iterator.ComputePosition())
|
| + EXPECT_EQ(Position::AfterNode(*select), dom_iterator.ComputePosition())
|
| << "This is redundant result, we should not have. see "
|
| "http://crbug.com/697283";
|
| dom_iterator.Decrement();
|
| @@ -78,10 +78,10 @@ TEST_F(PositionIteratorTest, decrementWithSelectElement) {
|
| EXPECT_EQ(PositionInFlatTree::LastPositionInNode(GetDocument().body()),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Decrement();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(select),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*select),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Decrement();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(select),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*select),
|
| flat_iterator.ComputePosition())
|
| << "This is redundant result, we should not have. see "
|
| "http://crbug.com/697283";
|
| @@ -107,7 +107,7 @@ TEST_F(PositionIteratorTest, decrementWithTextAreaElement) {
|
| EXPECT_EQ(Position::LastPositionInNode(GetDocument().body()),
|
| dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| - EXPECT_EQ(Position::AfterNode(textarea), dom_iterator.ComputePosition());
|
| + EXPECT_EQ(Position::AfterNode(*textarea), dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| EXPECT_EQ(Position::BeforeNode(*textarea), dom_iterator.ComputePosition());
|
| dom_iterator.Decrement();
|
| @@ -121,7 +121,7 @@ TEST_F(PositionIteratorTest, decrementWithTextAreaElement) {
|
| EXPECT_EQ(PositionInFlatTree::LastPositionInNode(GetDocument().body()),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Decrement();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(textarea),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*textarea),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Decrement();
|
| EXPECT_EQ(PositionInFlatTree::BeforeNode(*textarea),
|
| @@ -146,7 +146,7 @@ TEST_F(PositionIteratorTest, incrementWithInputElement) {
|
| dom_iterator.Increment();
|
| EXPECT_EQ(Position::BeforeNode(*input), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| - EXPECT_EQ(Position::AfterNode(input), dom_iterator.ComputePosition());
|
| + EXPECT_EQ(Position::AfterNode(*input), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| EXPECT_EQ(Position(GetDocument().body(), 1), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| @@ -161,7 +161,7 @@ TEST_F(PositionIteratorTest, incrementWithInputElement) {
|
| EXPECT_EQ(PositionInFlatTree::BeforeNode(*input),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Increment();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(input),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*input),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Increment();
|
| EXPECT_EQ(PositionInFlatTree(GetDocument().body(), 1),
|
| @@ -182,9 +182,9 @@ TEST_F(PositionIteratorTest, incrementWithSelectElement) {
|
| dom_iterator.Increment();
|
| EXPECT_EQ(Position::BeforeNode(*select), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| - EXPECT_EQ(Position::AfterNode(select), dom_iterator.ComputePosition());
|
| + EXPECT_EQ(Position::AfterNode(*select), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| - EXPECT_EQ(Position::AfterNode(select), dom_iterator.ComputePosition())
|
| + EXPECT_EQ(Position::AfterNode(*select), dom_iterator.ComputePosition())
|
| << "This is redundant result, we should not have. see "
|
| "http://crbug.com/697283";
|
| dom_iterator.Increment();
|
| @@ -201,10 +201,10 @@ TEST_F(PositionIteratorTest, incrementWithSelectElement) {
|
| EXPECT_EQ(PositionInFlatTree::BeforeNode(*select),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Increment();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(select),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*select),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Increment();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(select),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*select),
|
| flat_iterator.ComputePosition())
|
| << "This is redundant result, we should not have. see "
|
| "http://crbug.com/697283";
|
| @@ -228,7 +228,7 @@ TEST_F(PositionIteratorTest, incrementWithTextAreaElement) {
|
| dom_iterator.Increment();
|
| EXPECT_EQ(Position::BeforeNode(*textarea), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| - EXPECT_EQ(Position::AfterNode(textarea), dom_iterator.ComputePosition());
|
| + EXPECT_EQ(Position::AfterNode(*textarea), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| EXPECT_EQ(Position(GetDocument().body(), 1), dom_iterator.ComputePosition());
|
| dom_iterator.Increment();
|
| @@ -244,7 +244,7 @@ TEST_F(PositionIteratorTest, incrementWithTextAreaElement) {
|
| EXPECT_EQ(PositionInFlatTree::BeforeNode(*textarea),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Increment();
|
| - EXPECT_EQ(PositionInFlatTree::AfterNode(textarea),
|
| + EXPECT_EQ(PositionInFlatTree::AfterNode(*textarea),
|
| flat_iterator.ComputePosition());
|
| flat_iterator.Increment();
|
| EXPECT_EQ(PositionInFlatTree(GetDocument().body(), 1),
|
|
|