[Oilpan] Move ScrollAnimators onto oilpan heap

third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.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 "config.h"
 #include "platform/scroll/ProgrammaticScrollAnimator.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimation.h"
 #include "public/platform/WebCompositorAnimationPlayer.h"
 #include "public/platform/WebCompositorAnimationTimeline.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebScrollOffsetAnimationCurve.h"
 
 namespace blink {
 
-PassOwnPtr<ProgrammaticScrollAnimator> ProgrammaticScrollAnimator::create(ScrollableArea* scrollableArea)
+ProgrammaticScrollAnimator* ProgrammaticScrollAnimator::create(ScrollableArea* scrollableArea)
 {
-    return adoptPtr(new ProgrammaticScrollAnimator(scrollableArea));
+    return new ProgrammaticScrollAnimator(scrollableArea);
 }
 
 ProgrammaticScrollAnimator::ProgrammaticScrollAnimator(ScrollableArea* scrollableArea)
     : m_compositorAnimationAttachedToLayerId(0)
     , m_scrollableArea(scrollableArea)
     , m_startTime(0.0)
     , m_runState(RunState::Idle)
     , m_compositorAnimationId(0)
     , m_compositorAnimationGroupId(0)
 {
     if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
         ASSERT(Platform::current()->compositorSupport());
         m_compositorPlayer = adoptPtr(Platform::current()->compositorSupport()->createAnimationPlayer());
         ASSERT(m_compositorPlayer);
         m_compositorPlayer->setAnimationDelegate(this);
     }
 }
 
 ProgrammaticScrollAnimator::~ProgrammaticScrollAnimator()
 {
     if (m_compositorPlayer) {
         m_compositorPlayer->setAnimationDelegate(nullptr);

[haraken, 2015/11/27 05:10:14]

Not related to your CL, this is not nice... This setAnimationDelegate creates a
new unnecessary object in content/ (i.e., WebToCCAnimationDelegateAdapter) that
just holds the nullptr...

[peria, 2015/11/27 05:23:48]

Acknowledged.

         m_compositorPlayer.clear();
     }
 }
 
 void ProgrammaticScrollAnimator::resetAnimationState()
 {
     m_animationCurve.clear();
     m_startTime = 0.0;
     m_runState = RunState::Idle;
     m_compositorAnimationId = 0;
@@ skipping 226 matching lines @@
 void ProgrammaticScrollAnimator::notifyAnimationFinished(double monotonicTime, int group)
 {
     notifyCompositorAnimationFinished(group);
 }
 
 WebCompositorAnimationPlayer* ProgrammaticScrollAnimator::compositorPlayer() const
 {
     return m_compositorPlayer.get();
 }
 
+DEFINE_TRACE(ProgrammaticScrollAnimator)
+{
+    visitor->trace(m_scrollableArea);
+}
+
 } // namespace blink