Oilpan: improve ScrollableArea handling.

Source/platform/scroll/ScrollableAreaTest.cpp

 // Copyright 2015 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 "config.h"
 #include "platform/scroll/ScrollableArea.h"
 
 #include "platform/TestingPlatformSupport.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 #include "public/platform/WebThread.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 namespace blink {
 
-class MockScrollableArea : public ScrollableArea {
+class MockScrollableArea : public NoBaseWillBeGarbageCollectedFinalized<MockScrollableArea>, public ScrollableArea {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockScrollableArea);
 public:
-    MockScrollableArea(const IntPoint& maximumScrollPosition)
-        : m_maximumScrollPosition(maximumScrollPosition) { }
+    static PassOwnPtrWillBeRawPtr<MockScrollableArea> create(const IntPoint& maximumScrollPosition)
+    {
+        return adoptPtrWillBeNoop(new MockScrollableArea(maximumScrollPosition));
+    }
 
     MOCK_CONST_METHOD0(isActive, bool());
     MOCK_CONST_METHOD1(scrollSize, int(ScrollbarOrientation));
     MOCK_METHOD2(invalidateScrollbar, void(Scrollbar*, const IntRect&));
     MOCK_CONST_METHOD0(isScrollCornerVisible, bool());
     MOCK_CONST_METHOD0(scrollCornerRect, IntRect());
     MOCK_METHOD2(invalidateScrollbarRect, void(Scrollbar*, const IntRect&));
     MOCK_METHOD1(invalidateScrollCornerRect, void(const IntRect&));
     MOCK_CONST_METHOD0(enclosingScrollableArea, ScrollableArea*());
     MOCK_CONST_METHOD1(visibleContentRect, IntRect(IncludeScrollbarsInRect));
     MOCK_CONST_METHOD0(contentsSize, IntSize());
     MOCK_CONST_METHOD0(scrollbarsCanBeActive, bool());
     MOCK_CONST_METHOD0(scrollableAreaBoundingBox, IntRect());
 
     bool userInputScrollable(ScrollbarOrientation) const override { return true; }
     bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
     void setScrollOffset(const IntPoint& offset, ScrollType) override { m_scrollPosition = offset.shrunkTo(m_maximumScrollPosition); }
     IntPoint scrollPosition() const override { return m_scrollPosition; }
     IntPoint minimumScrollPosition() const override { return IntPoint(); }
     IntPoint maximumScrollPosition() const override { return m_maximumScrollPosition; }
     int visibleHeight() const override { return 768; }
     int visibleWidth() const override { return 1024; }
     bool scrollAnimatorEnabled() const override { return false; }
     int pageStep(ScrollbarOrientation) const override { return 0; }
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        ScrollableArea::trace(visitor);
+    }
+
 private:
+    explicit MockScrollableArea(const IntPoint& maximumScrollPosition)
+        : m_maximumScrollPosition(maximumScrollPosition) { }
+
     IntPoint m_scrollPosition;
     IntPoint m_maximumScrollPosition;
 };
 
 class FakeWebThread : public WebThread {
 public:
     FakeWebThread() { }
     ~FakeWebThread() override { }
 
     void postTask(const WebTraceLocation&, Task*) override
@@ skipping 49 matching lines @@
         Platform::initialize(m_oldPlatform);
     }
 
 private:
     FakePlatform m_fakePlatform;
     Platform* m_oldPlatform; // Not owned.
 };
 
 TEST_F(ScrollableAreaTest, ScrollAnimatorCurrentPositionShouldBeSync)
 {
-    MockScrollableArea scrollableArea(IntPoint(0, 100));
-    scrollableArea.setScrollPosition(IntPoint(0, 10000), CompositorScroll);
-    EXPECT_EQ(100.0, scrollableArea.scrollAnimator()->currentPosition().y());
+    OwnPtrWillBeRawPtr<MockScrollableArea> scrollableArea = MockScrollableArea::create(IntPoint(0, 100));
+    scrollableArea->setScrollPosition(IntPoint(0, 10000), CompositorScroll);
+    EXPECT_EQ(100.0, scrollableArea->scrollAnimator()->currentPosition().y());
 }
 
 } // namespace blink