Oilpan: improve ScrollableArea handling.

Source/platform/graphics/GraphicsLayerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 107 matching lines @@
     ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
 
     m_graphicsLayer->setShouldFlattenTransform(true);
 
     m_platformLayer = m_graphicsLayer->platformLayer();
     ASSERT_TRUE(m_platformLayer);
 
     ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
 }
 
-class FakeScrollableArea : public ScrollableArea {
+class FakeScrollableArea : public NoBaseWillBeGarbageCollectedFinalized<FakeScrollableArea>, public ScrollableArea {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FakeScrollableArea);
 public:
+    static PassOwnPtrWillBeRawPtr<FakeScrollableArea> create()
+    {
+        return adoptPtrWillBeNoop(new FakeScrollableArea);
+    }
+
     bool isActive() const override { return false; }
     int scrollSize(ScrollbarOrientation) const override { return 100; }
     bool isScrollCornerVisible() const override { return false; }
     IntRect scrollCornerRect() const override { return IntRect(); }
     int visibleWidth() const override { return 10; }
     int visibleHeight() const override { return 10; }
     IntSize contentsSize() const override { return IntSize(100, 100); }
     bool scrollbarsCanBeActive() const override { return false; }
     IntRect scrollableAreaBoundingBox() const override { return IntRect(); }
     void invalidateScrollbarRect(Scrollbar*, const IntRect&) override { }
     void invalidateScrollCornerRect(const IntRect&) override { }
     bool userInputScrollable(ScrollbarOrientation) const override { return true; }
     bool shouldPlaceVerticalScrollbarOnLeft() const override { return false; }
     int pageStep(ScrollbarOrientation) const override { return 0; }
     IntPoint minimumScrollPosition() const override { return IntPoint(); }
     IntPoint maximumScrollPosition() const override
     {
         return IntPoint(contentsSize().width() - visibleWidth(), contentsSize().height() - visibleHeight());
     }
 
     void setScrollOffset(const IntPoint& scrollOffset, ScrollType) override { m_scrollPosition = scrollOffset; }
     void setScrollOffset(const DoublePoint& scrollOffset, ScrollType) override { m_scrollPosition = scrollOffset; }
     DoublePoint scrollPositionDouble() const override { return m_scrollPosition; }
     IntPoint scrollPosition() const override { return flooredIntPoint(m_scrollPosition); }
 
+    DEFINE_INLINE_VIRTUAL_TRACE()
+    {
+        ScrollableArea::trace(visitor);
+    }
+
 private:
     DoublePoint m_scrollPosition;
 };
 
 TEST_F(GraphicsLayerTest, applyScrollToScrollableArea)
 {
-    FakeScrollableArea scrollableArea;
-    m_graphicsLayer->setScrollableArea(&scrollableArea, false);
+    OwnPtrWillBeRawPtr<FakeScrollableArea> scrollableArea = FakeScrollableArea::create();
+    m_graphicsLayer->setScrollableArea(scrollableArea.get(), false);
 
     WebDoublePoint scrollPosition(7, 9);
     m_platformLayer->setScrollPositionDouble(scrollPosition);
     m_graphicsLayer->didScroll();
 
-    EXPECT_FLOAT_EQ(scrollPosition.x, scrollableArea.scrollPositionDouble().x());
-    EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea.scrollPositionDouble().y());
+    EXPECT_FLOAT_EQ(scrollPosition.x, scrollableArea->scrollPositionDouble().x());
+    EXPECT_FLOAT_EQ(scrollPosition.y, scrollableArea->scrollPositionDouble().y());
 }
 
 } // namespace blink