| Index: third_party/WebKit/Source/web/tests/TopControlsTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/TopControlsTest.cpp b/third_party/WebKit/Source/web/tests/TopControlsTest.cpp
|
| index e6a39ff13f3bdd3036ffe121ec0e665ca9cd9138..a4de2cf1ea885c44b2450367c29c733619cdfba1 100644
|
| --- a/third_party/WebKit/Source/web/tests/TopControlsTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/TopControlsTest.cpp
|
| @@ -120,9 +120,9 @@ public:
|
| webViewImpl()->handleInputEvent(generateEvent(WebInputEvent::GestureScrollEnd));
|
| }
|
|
|
| - PassRefPtrWillBeRawPtr<Element> getElementById(const WebString& id)
|
| + RawPtr<Element> getElementById(const WebString& id)
|
| {
|
| - return static_cast<PassRefPtrWillBeRawPtr<Element>>(
|
| + return static_cast<RawPtr<Element>>(
|
| webViewImpl()->mainFrame()->document().getElementById(id));
|
| }
|
|
|
| @@ -577,9 +577,9 @@ TEST_F(TopControlsTest, MAYBE(DontAffectLayoutHeight))
|
| // When the top controls are showing, there's 300px for the layout height so
|
| // 50% should result in both the position:fixed and position: absolute divs
|
| // having 150px of height.
|
| - RefPtrWillBeRawPtr<Element> absPos =
|
| + RawPtr<Element> absPos =
|
| getElementById(WebString::fromUTF8("abs"));
|
| - RefPtrWillBeRawPtr<Element> fixedPos =
|
| + RawPtr<Element> fixedPos =
|
| getElementById(WebString::fromUTF8("fixed"));
|
| EXPECT_FLOAT_EQ(150.f, absPos->getBoundingClientRect()->height());
|
| EXPECT_FLOAT_EQ(150.f, fixedPos->getBoundingClientRect()->height());
|
| @@ -621,9 +621,9 @@ TEST_F(TopControlsTest, MAYBE(DontAffectVHUnits))
|
|
|
| // 'vh' units should be based on the viewport when the top controls are
|
| // hidden.
|
| - RefPtrWillBeRawPtr<Element> absPos =
|
| + RawPtr<Element> absPos =
|
| getElementById(WebString::fromUTF8("abs"));
|
| - RefPtrWillBeRawPtr<Element> fixedPos =
|
| + RawPtr<Element> fixedPos =
|
| getElementById(WebString::fromUTF8("fixed"));
|
| EXPECT_FLOAT_EQ(200.f, absPos->getBoundingClientRect()->height());
|
| EXPECT_FLOAT_EQ(200.f, fixedPos->getBoundingClientRect()->height());
|
| @@ -675,9 +675,9 @@ TEST_F(TopControlsTest, MAYBE(DontAffectVHUnitsWithScale))
|
| // we have to account for the minimum page scale factor. Since both boxes
|
| // are 50vh, and layout scale = 0.5, we have a vh viewport of 400 / 0.5 = 800
|
| // so we expect 50vh to be 400px.
|
| - RefPtrWillBeRawPtr<Element> absPos =
|
| + RawPtr<Element> absPos =
|
| getElementById(WebString::fromUTF8("abs"));
|
| - RefPtrWillBeRawPtr<Element> fixedPos =
|
| + RawPtr<Element> fixedPos =
|
| getElementById(WebString::fromUTF8("fixed"));
|
| EXPECT_FLOAT_EQ(400.f, absPos->getBoundingClientRect()->height());
|
| EXPECT_FLOAT_EQ(400.f, fixedPos->getBoundingClientRect()->height());
|
|
|