Move the Widget hierarchy to the Oilpan heap.

Source/web/tests/ScrollAnimatorNoneTest.cpp

 /*
  * Copyright (C) 2010 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
@@ skipping 62 matching lines @@
     virtual int visibleWidth() const override { return 1024; }
     virtual bool scrollAnimatorEnabled() const override { return m_scrollAnimatorEnabled; }
     virtual int pageStep(ScrollbarOrientation) const override { return 0; }
 
 private:
     bool m_scrollAnimatorEnabled;
 };
 
 class MockScrollAnimatorNone : public ScrollAnimatorNone {
 public:
-    MockScrollAnimatorNone(ScrollableArea* scrollableArea)
-        : ScrollAnimatorNone(scrollableArea) { }
+    static PassRefPtr<MockScrollAnimatorNone> create(ScrollableArea* scrollableArea)
+    {
+        return adoptRef(new MockScrollAnimatorNone(scrollableArea));
+    }
 
     float currentX() { return m_currentPosX; }
     float currentY() { return m_currentPosY; }
 
     FloatPoint m_fp;
     int m_count;
 
     void reset()
     {
         stopAnimationTimerIfNeeded();
         m_currentPosX = 0;
         m_currentPosY = 0;
         m_horizontalData.reset();
         m_verticalData.reset();
         m_fp = FloatPoint::zero();
         m_count = 0;
     }
 
     virtual void fireUpAnAnimation(FloatPoint fp)
     {
         m_fp = fp;
         m_count++;
     }
 
     MOCK_METHOD1(scrollToOffsetWithoutAnimation, void(const FloatPoint&));
+private:
+    explicit MockScrollAnimatorNone(ScrollableArea* scrollableArea)
+        : ScrollAnimatorNone(scrollableArea) { }
+
 };
 
 TEST(ScrollAnimatorEnabled, Enabled)
 {
     MockScrollableArea scrollableArea(true);
-    MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);
+    RefPtr<MockScrollAnimatorNone> scrollAnimatorNone = MockScrollAnimatorNone::create(&scrollableArea);
 
     EXPECT_CALL(scrollableArea, scrollSize(_)).Times(AtLeast(1)).WillRepeatedly(Return(1000));
     EXPECT_CALL(scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));
     EXPECT_CALL(scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));
     EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
-    EXPECT_NE(100, scrollAnimatorNone.currentX());
-    EXPECT_NE(0, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
+    EXPECT_NE(100, scrollAnimatorNone->currentX());
+    EXPECT_NE(0, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
-    EXPECT_NE(100, scrollAnimatorNone.currentX());
-    EXPECT_NE(0, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
+    EXPECT_NE(100, scrollAnimatorNone->currentX());
+    EXPECT_NE(0, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
-    EXPECT_NE(100, scrollAnimatorNone.currentX());
-    EXPECT_NE(0, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPixel, 4, 25);
+    EXPECT_NE(100, scrollAnimatorNone->currentX());
+    EXPECT_NE(0, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPrecisePixel, 4, 25);
-    EXPECT_EQ(100, scrollAnimatorNone.currentX());
-    EXPECT_NE(0, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPrecisePixel, 4, 25);
+    EXPECT_EQ(100, scrollAnimatorNone->currentX());
+    EXPECT_NE(0, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 }
 
 TEST(ScrollAnimatorEnabled, Disabled)
 {
     MockScrollableArea scrollableArea(false);
-    MockScrollAnimatorNone scrollAnimatorNone(&scrollableArea);
+    RefPtr<MockScrollAnimatorNone> scrollAnimatorNone = MockScrollAnimatorNone::create(&scrollableArea);
 
     EXPECT_CALL(scrollableArea, minimumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint()));
     EXPECT_CALL(scrollableArea, maximumScrollPosition()).Times(AtLeast(1)).WillRepeatedly(Return(IntPoint(1000, 1000)));
     EXPECT_CALL(scrollableArea, setScrollOffset(_)).Times(4);
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByLine, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPage, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByDocument, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByDocument, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 
-    scrollAnimatorNone.scroll(HorizontalScrollbar, ScrollByPixel, 100, 1);
-    EXPECT_EQ(100, scrollAnimatorNone.currentX());
-    EXPECT_EQ(0, scrollAnimatorNone.currentY());
-    scrollAnimatorNone.reset();
+    scrollAnimatorNone->scroll(HorizontalScrollbar, ScrollByPixel, 100, 1);
+    EXPECT_EQ(100, scrollAnimatorNone->currentX());
+    EXPECT_EQ(0, scrollAnimatorNone->currentY());
+    scrollAnimatorNone->reset();
 }
 
 class ScrollAnimatorNoneTest : public testing::Test {
 public:
     struct SavePerAxisData : public ScrollAnimatorNone::PerAxisData {
         SavePerAxisData(const ScrollAnimatorNone::PerAxisData& data)
-            : ScrollAnimatorNone::PerAxisData(&m_mockScrollAnimatorNone, 0, 768)
+            : ScrollAnimatorNone::PerAxisData(m_mockScrollAnimatorNone.get(), 0, 768)

[Nico, 2014/10/13 15:41:13]

clang/win bot says:

..\..\third_party\WebKit\Source\web\tests\ScrollAnimatorNoneTest.cpp(187,47) : 
warning(clang): field 'm_mockScrollAnimatorNone' is uninitialized when used here
[-Wuninitialized]
            : ScrollAnimatorNone::PerAxisData(m_mockScrollAnimatorNone.get(), 0,
768)
                                              ^
1 warning generated.

(didn't matter before because before we only took the address of an
uninitialized variable, but now we're calling methods on an object whose
constructor hasn't yet run)

             , m_mockScrollableArea(true)
-            , m_mockScrollAnimatorNone(&m_mockScrollableArea)
+            , m_mockScrollAnimatorNone(MockScrollAnimatorNone::create(&m_mockScrollableArea))
         {
             this->m_currentVelocity = data.m_currentVelocity;
             this->m_desiredPosition = data.m_desiredPosition;
             this->m_desiredVelocity = data.m_desiredVelocity;
             this->m_startPosition = data.m_startPosition;
             this->m_startTime = data.m_startTime;
             this->m_startVelocity = data.m_startVelocity;
             this->m_animationTime = data.m_animationTime;
             this->m_lastAnimationTime = data.m_lastAnimationTime;
             this->m_attackPosition = data.m_attackPosition;
             this->m_attackTime = data.m_attackTime;
             this->m_attackCurve = data.m_attackCurve;
             this->m_releasePosition = data.m_releasePosition;
             this->m_releaseTime = data.m_releaseTime;
             this->m_releaseCurve = data.m_releaseCurve;
         }
 
         bool operator==(const SavePerAxisData& other) const
         {
             return m_currentVelocity == other.m_currentVelocity && m_desiredPosition == other.m_desiredPosition && m_desiredVelocity == other.m_desiredVelocity && m_startPosition == other.m_startPosition && m_startTime == other.m_startTime && m_startVelocity == other.m_startVelocity && m_animationTime == other.m_animationTime && m_lastAnimationTime == other.m_lastAnimationTime && m_attackPosition == other.m_attackPosition && m_attackTime == other.m_attackTime && m_attackCurve == other.m_attackCurve && m_releasePosition == other.m_releasePosition && m_releaseTime == other.m_releaseTime && m_releaseCurve == other.m_releaseCurve;
         }
         MockScrollableArea m_mockScrollableArea;
-        MockScrollAnimatorNone m_mockScrollAnimatorNone;
+        RefPtr<MockScrollAnimatorNone> m_mockScrollAnimatorNone;
     };
 
     ScrollAnimatorNoneTest()
         : m_mockScrollableArea(true)
-        , m_mockScrollAnimatorNone(&m_mockScrollableArea)
+        , m_mockScrollAnimatorNone(MockScrollAnimatorNone::create(&m_mockScrollableArea))
     {
     }
 
     virtual void SetUp()
     {
         m_currentPosition = 100;
-        m_data = new ScrollAnimatorNone::PerAxisData(&m_mockScrollAnimatorNone, &m_currentPosition, 768);
+        m_data = new ScrollAnimatorNone::PerAxisData(m_mockScrollAnimatorNone.get(), &m_currentPosition, 768);
     }
     virtual void TearDown()
     {
         delete m_data;
     }
 
     void reset();
     bool updateDataFromParameters(float step, float multiplier, float scrollableSize, double currentTime, ScrollAnimatorNone::Parameters*);
     bool animateScroll(double currentTime);
 
     double attackArea(ScrollAnimatorNone::Curve, double startT, double endT);
     double releaseArea(ScrollAnimatorNone::Curve, double startT, double endT);
     double attackCurve(ScrollAnimatorNone::Curve, double deltaT, double curveT, double startPosition, double attackPosition);
     double releaseCurve(ScrollAnimatorNone::Curve, double deltaT, double curveT, double releasePosition, double desiredPosition);
     double coastCurve(ScrollAnimatorNone::Curve, double factor);
 
     void curveTestInner(ScrollAnimatorNone::Curve, double step, double time);
     void curveTest(ScrollAnimatorNone::Curve);
 
     void checkDesiredPosition(float expectedPosition);
     void checkSoftLanding(float expectedPosition);
 
     static double kTickTime;
     static double kAnimationTime;
     static double kStartTime;
     static double kEndTime;
     float m_currentPosition;
     MockScrollableArea m_mockScrollableArea;
-    MockScrollAnimatorNone m_mockScrollAnimatorNone;
+    RefPtr<MockScrollAnimatorNone> m_mockScrollAnimatorNone;
     bool m_scrollingDown;
     ScrollAnimatorNone::PerAxisData* m_data;
 };
 
 double ScrollAnimatorNoneTest::kTickTime = 1 / 60.0;
 double ScrollAnimatorNoneTest::kAnimationTime = 0.01;
 double ScrollAnimatorNoneTest::kStartTime = 10.0;
 double ScrollAnimatorNoneTest::kEndTime = 20.0;
 
 void ScrollAnimatorNoneTest::reset()
@@ skipping 785 matching lines @@
     EXPECT_TRUE(result);
     result = result && animateScroll(t);
     double after = m_currentPosition;
     EXPECT_GE(before, after);
 
     t += kAnimationTime;
     for (; result && t < kEndTime; t += kAnimationTime)
         result = result && animateScroll(t);
     EXPECT_GE(before, m_currentPosition);
 }