Oilpan: Remove WillBe types (part 7)

third_party/WebKit/Source/core/frame/RootFrameViewportTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/RootFrameViewport.h"
 
 #include "core/layout/ScrollAlignment.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define EXPECT_POINT_EQ(expected, actual) \
     do { \
         EXPECT_EQ((expected).x(), (actual).x()); \
         EXPECT_EQ((expected).y(), (actual).y()); \
     } while (false)
 #define EXPECT_SIZE_EQ(expected, actual) \
     do { \
         EXPECT_EQ((expected).width(), (actual).width()); \
         EXPECT_EQ((expected).height(), (actual).height()); \
     } while (false)
 
 namespace blink {
 
-class ScrollableAreaStub : public NoBaseWillBeGarbageCollectedFinalized<ScrollableAreaStub>, public ScrollableArea {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ScrollableAreaStub);
+class ScrollableAreaStub : public GarbageCollectedFinalized<ScrollableAreaStub>, public ScrollableArea {
+    USING_GARBAGE_COLLECTED_MIXIN(ScrollableAreaStub);
 public:
-    static PassOwnPtrWillBeRawPtr<ScrollableAreaStub> create(const IntSize& viewportSize, const IntSize& contentsSize)
+    static RawPtr<ScrollableAreaStub> create(const IntSize& viewportSize, const IntSize& contentsSize)
     {
-        return adoptPtrWillBeNoop(new ScrollableAreaStub(viewportSize, contentsSize));
+        return new ScrollableAreaStub(viewportSize, contentsSize);
     }
 
     void setViewportSize(const IntSize& viewportSize)
     {
         m_viewportSize = viewportSize;
     }
 
     IntSize viewportSize() const { return m_viewportSize; }
 
     // ScrollableArea Impl
@@ skipping 64 matching lines @@
 
     bool m_userInputScrollableX;
     bool m_userInputScrollableY;
     DoublePoint m_scrollPosition;
     IntSize m_viewportSize;
     IntSize m_contentsSize;
 };
 
 class RootFrameViewStub : public ScrollableAreaStub {
 public:
-    static PassOwnPtrWillBeRawPtr<RootFrameViewStub> create(const IntSize& viewportSize, const IntSize& contentsSize)
+    static RawPtr<RootFrameViewStub> create(const IntSize& viewportSize, const IntSize& contentsSize)
     {
-        return adoptPtrWillBeNoop(new RootFrameViewStub(viewportSize, contentsSize));
+        return new RootFrameViewStub(viewportSize, contentsSize);
     }
 
     DoublePoint maximumScrollPositionDouble() const override
     {
         return IntPoint(contentsSize() - viewportSize());
     }
 
 private:
     RootFrameViewStub(const IntSize& viewportSize, const IntSize& contentsSize)
         : ScrollableAreaStub(viewportSize, contentsSize)
     {
     }
 
     int visibleWidth() const override { return m_viewportSize.width(); }
     int visibleHeight() const override { return m_viewportSize.height(); }
 };
 
 class VisualViewportStub : public ScrollableAreaStub {
 public:
-    static PassOwnPtrWillBeRawPtr<VisualViewportStub> create(const IntSize& viewportSize, const IntSize& contentsSize)
+    static RawPtr<VisualViewportStub> create(const IntSize& viewportSize, const IntSize& contentsSize)
     {
-        return adoptPtrWillBeNoop(new VisualViewportStub(viewportSize, contentsSize));
+        return new VisualViewportStub(viewportSize, contentsSize);
     }
 
     DoublePoint maximumScrollPositionDouble() const override
     {
         DoubleSize visibleViewport = viewportSize();
         visibleViewport.scale(1 / m_scale);
 
         DoubleSize maxPosition = DoubleSize(contentsSize()) - visibleViewport;
         return DoublePoint(maxPosition);
     }
@@ skipping 31 matching lines @@
     {
     }
 };
 
 // Tests that scrolling the viewport when the layout viewport is
 // !userInputScrollable (as happens when overflow:hidden is set) works
 // correctly, that is, the visual viewport can scroll, but not the layout.
 TEST_F(RootFrameViewportTest, UserInputScrollable)
 {
     IntSize viewportSize(100, 150);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
+    RawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
+    RawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
+    RawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     visualViewport->setScale(2);
 
     // Disable just the layout viewport's horizontal scrolling, the
     // RootFrameViewport should remain scrollable overall.
     layoutViewport->setUserInputScrollable(false, true);
     visualViewport->setUserInputScrollable(true, true);
 
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(HorizontalScrollbar));
     EXPECT_TRUE(rootFrameViewport->userInputScrollable(VerticalScrollbar));
@@ skipping 37 matching lines @@
     EXPECT_POINT_EQ(DoublePoint(50, 75), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(150, 75), rootFrameViewport->scrollPositionDouble());
 }
 
 // Make sure scrolls using the scroll animator (scroll(), setScrollPosition())
 // work correctly when one of the subviewports is explicitly scrolled without using the
 // RootFrameViewport interface.
 TEST_F(RootFrameViewportTest, TestScrollAnimatorUpdatedBeforeScroll)
 {
     IntSize viewportSize(100, 150);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
+    RawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
+    RawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
+    RawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     visualViewport->setScale(2);
 
     visualViewport->setScrollPosition(DoublePoint(50, 75), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(50, 75), rootFrameViewport->scrollPositionDouble());
 
     // If the scroll animator doesn't update, it will still think it's at (0, 0) and so it
     // may early exit.
     rootFrameViewport->setScrollPosition(DoublePoint(0, 0), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(0, 0), rootFrameViewport->scrollPositionDouble());
@@ skipping 15 matching lines @@
     rootFrameViewport->userScroll(ScrollByPixel, FloatSize(-100, 0));
     EXPECT_POINT_EQ(DoublePoint(0, 150), rootFrameViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 150), layoutViewport->scrollPositionDouble());
 }
 
 // Test that the scrollIntoView correctly scrolls the main frame
 // and visual viewport such that the given rect is centered in the viewport.
 TEST_F(RootFrameViewportTest, ScrollIntoView)
 {
     IntSize viewportSize(100, 150);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
+    RawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
+    RawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
+    RawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     // Test that the visual viewport is scrolled if the viewport has been
     // resized (as is the case when the ChromeOS keyboard comes up) but not
     // scaled.
     visualViewport->setViewportSize(IntSize(100, 100));
     rootFrameViewport->scrollIntoView(
         LayoutRect(100, 250, 50, 50),
         ScrollAlignment::alignToEdgeIfNeeded,
         ScrollAlignment::alignToEdgeIfNeeded);
     EXPECT_POINT_EQ(DoublePoint(50, 150), layoutViewport->scrollPositionDouble());
@@ skipping 51 matching lines @@
         ScrollAlignment::alignTopAlways,
         ScrollAlignment::alignTopAlways);
     EXPECT_POINT_EQ(DoublePoint(50, 50), layoutViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 10), visualViewport->scrollPositionDouble());
 }
 
 // Tests that the setScrollPosition method works correctly with both viewports.
 TEST_F(RootFrameViewportTest, SetScrollPosition)
 {
     IntSize viewportSize(500, 500);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(1000, 2000));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
+    RawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(1000, 2000));
+    RawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
+    RawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     visualViewport->setScale(2);
 
     // Ensure that the visual viewport scrolls first.
     rootFrameViewport->setScrollPosition(DoublePoint(100, 100), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(100, 100), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
 
     // Scroll to the visual viewport's extent, the layout viewport should scroll the
     // remainder.
@@ skipping 11 matching lines @@
     rootFrameViewport->setScrollPosition(DoublePoint(0, 0), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(0, 0), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
 }
 
 // Tests that the visible rect (i.e. visual viewport rect) is correctly
 // calculated, taking into account both viewports and page scale.
 TEST_F(RootFrameViewportTest, VisibleContentRect)
 {
     IntSize viewportSize(500, 401);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(1000, 2000));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
+    RawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(1000, 2000));
+    RawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
+    RawPtr<ScrollableArea> rootFrameViewport = RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     rootFrameViewport->setScrollPosition(DoublePoint(100, 75), ProgrammaticScroll);
 
     EXPECT_POINT_EQ(DoublePoint(100, 75), rootFrameViewport->visibleContentRect().location());
     EXPECT_POINT_EQ(DoublePoint(100, 75), rootFrameViewport->visibleContentRectDouble().location());
     EXPECT_SIZE_EQ(DoubleSize(500, 401), rootFrameViewport->visibleContentRect().size());
     EXPECT_SIZE_EQ(DoubleSize(500, 401), rootFrameViewport->visibleContentRectDouble().size());
 
     visualViewport->setScale(2);
 
     EXPECT_POINT_EQ(DoublePoint(100, 75), rootFrameViewport->visibleContentRect().location());
     EXPECT_POINT_EQ(DoublePoint(100, 75), rootFrameViewport->visibleContentRectDouble().location());
     EXPECT_SIZE_EQ(DoubleSize(250, 201), rootFrameViewport->visibleContentRect().size());
     EXPECT_SIZE_EQ(DoubleSize(250, 200.5), rootFrameViewport->visibleContentRectDouble().size());
 }
 
 // Tests that scrolls on the root frame scroll the visual viewport before
 // trying to scroll the layout viewport.
 TEST_F(RootFrameViewportTest, ViewportScrollOrder)
 {
     IntSize viewportSize(100, 100);
-    OwnPtrWillBeRawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
-    OwnPtrWillBeRawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
+    RawPtr<RootFrameViewStub> layoutViewport = RootFrameViewStub::create(viewportSize, IntSize(200, 300));
+    RawPtr<VisualViewportStub> visualViewport = VisualViewportStub::create(viewportSize, viewportSize);
 
-    OwnPtrWillBeRawPtr<ScrollableArea> rootFrameViewport =
+    RawPtr<ScrollableArea> rootFrameViewport =
         RootFrameViewport::create(*visualViewport.get(), *layoutViewport.get());
 
     visualViewport->setScale(2);
 
     rootFrameViewport->setScrollPosition(DoublePoint(40, 40), UserScroll);
     EXPECT_POINT_EQ(DoublePoint(40, 40), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(0, 0), layoutViewport->scrollPositionDouble());
 
     rootFrameViewport->setScrollPosition(DoublePoint(60, 60), ProgrammaticScroll);
     EXPECT_POINT_EQ(DoublePoint(50, 50), visualViewport->scrollPositionDouble());
     EXPECT_POINT_EQ(DoublePoint(10, 10), layoutViewport->scrollPositionDouble());
 }
 
 } // namespace blink