| Index: third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
|
| index 6c7a1a90053f5a78cc65b3f43dfb4815254d765b..8e93552725abeb02f1b4eeaf7e8532645c9500d3 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp
|
| @@ -21,7 +21,7 @@ TEST_F(ScrollStateTest, ConsumeDeltaNative)
|
| const float deltaXToConsume = 1.2;
|
| const float deltaYToConsume = 2.3;
|
|
|
| - RefPtrWillBeRawPtr<ScrollState> scrollState = ScrollState::create(deltaX, deltaY, 0, 0, 0, false, false);
|
| + RawPtr<ScrollState> scrollState = ScrollState::create(deltaX, deltaY, 0, 0, 0, false, false);
|
| EXPECT_FLOAT_EQ(deltaX, scrollState->deltaX());
|
| EXPECT_FLOAT_EQ(deltaY, scrollState->deltaY());
|
| EXPECT_FALSE(scrollState->deltaConsumedForScrollSequence());
|
| @@ -52,9 +52,9 @@ TEST_F(ScrollStateTest, ConsumeDeltaNative)
|
|
|
| TEST_F(ScrollStateTest, CurrentNativeScrollingElement)
|
| {
|
| - RefPtrWillBeRawPtr<ScrollState> scrollState =
|
| + RawPtr<ScrollState> scrollState =
|
| ScrollState::create(0, 0, 0, 0, 0, false, false);
|
| - RefPtrWillBeRawPtr<Element> element = Element::create(
|
| + RawPtr<Element> element = Element::create(
|
| QualifiedName::null(), Document::create().get());
|
| scrollState->setCurrentNativeScrollingElement(element.get());
|
|
|
| @@ -63,11 +63,11 @@ TEST_F(ScrollStateTest, CurrentNativeScrollingElement)
|
|
|
| TEST_F(ScrollStateTest, FullyConsumed)
|
| {
|
| - RefPtrWillBeRawPtr<ScrollState> scrollStateBegin =
|
| + RawPtr<ScrollState> scrollStateBegin =
|
| ScrollState::create(0, 0, 0, 0, 0, false, true, false);
|
| - RefPtrWillBeRawPtr<ScrollState> scrollState =
|
| + RawPtr<ScrollState> scrollState =
|
| ScrollState::create(0, 0, 0, 0, 0, false, false, false);
|
| - RefPtrWillBeRawPtr<ScrollState> scrollStateEnd =
|
| + RawPtr<ScrollState> scrollStateEnd =
|
| ScrollState::create(0, 0, 0, 0, 0, false, false, true);
|
| EXPECT_FALSE(scrollStateBegin->fullyConsumed());
|
| EXPECT_TRUE(scrollState->fullyConsumed());
|
|
|