[Oilpan] Move ScrollAnimators onto oilpan heap

third_party/WebKit/Source/platform/scroll/ScrollableArea.h

 /*
  * Copyright (C) 2008, 2011 Apple 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 108 matching lines @@
     virtual void contentsResized();
 
     bool hasOverlayScrollbars() const;
     void setScrollbarOverlayStyle(ScrollbarOverlayStyle);
     ScrollbarOverlayStyle scrollbarOverlayStyle() const { return static_cast<ScrollbarOverlayStyle>(m_scrollbarOverlayStyle); }
 
     // This getter will create a ScrollAnimatorBase if it doesn't already exist.
     ScrollAnimatorBase* scrollAnimator() const;
 
     // This getter will return null if the ScrollAnimatorBase hasn't been created yet.
-    ScrollAnimatorBase* existingScrollAnimator() const { return m_animators ? m_animators->scrollAnimator.get() : 0; }
+    ScrollAnimatorBase* existingScrollAnimator() const { return m_scrollAnimator.get(); }
 
     ProgrammaticScrollAnimator* programmaticScrollAnimator() const;
-    ProgrammaticScrollAnimator* existingProgrammaticScrollAnimator() const
-    {
-        return m_animators ? m_animators->programmaticScrollAnimator.get() : 0;
-    }
+    ProgrammaticScrollAnimator* existingProgrammaticScrollAnimator() const { return m_programmaticScrollAnimator.get(); }
 
     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
     bool scrollOriginChanged() const { return m_scrollOriginChanged; }
 
 
     // This is used to determine whether the incoming fractional scroll offset should
     // be truncated to integer. Current rule is that if preferCompositingToLCDTextEnabled()
     // is disabled (which is true on low-dpi device by default) we should do the truncation.
     // The justification is that non-composited elements using fractional scroll offsets
     // is causing too much nasty bugs but does not add too benefit on low-dpi devices.
@@ skipping 125 matching lines @@
     // updateScrollbars. Expose this here to allow RootFrameViewport to match the
     // semantics for now but it should be cleaned up at the source.
     virtual bool isProgrammaticallyScrollable() { return true; }
 
     // Subtracts space occupied by this ScrollableArea's scrollbars.
     // Does nothing if overlay scrollbars are enabled.
     IntSize excludeScrollbars(const IntSize&) const;
 
     // Need to promptly let go of owned animator objects.
     EAGERLY_FINALIZE();
-    DEFINE_INLINE_VIRTUAL_TRACE() { }
+    DECLARE_VIRTUAL_TRACE();
 
 protected:
     ScrollableArea();
 
     void setScrollOrigin(const IntPoint&);
     void resetScrollOriginChanged() { m_scrollOriginChanged = false; }
 
     // Needed to let the animators call scrollPositionChanged.
     friend class ScrollAnimatorBase;
     friend class ProgrammaticScrollAnimator;
@@ skipping 26 matching lines @@
     virtual void setScrollOffset(const DoublePoint& offset, ScrollType scrollType)
     {
         setScrollOffset(flooredIntPoint(offset), scrollType);
     }
 
     virtual int lineStep(ScrollbarOrientation) const;
     virtual int pageStep(ScrollbarOrientation) const;
     virtual int documentStep(ScrollbarOrientation) const;
     virtual float pixelStep(ScrollbarOrientation) const;
 
-    struct ScrollableAreaAnimators {
-        OwnPtr<ScrollAnimatorBase> scrollAnimator;
-        OwnPtr<ProgrammaticScrollAnimator> programmaticScrollAnimator;
-    };
-
-    mutable OwnPtr<ScrollableAreaAnimators> m_animators;
+    mutable OwnPtrWillBeMember<ScrollAnimatorBase> m_scrollAnimator;
+    mutable OwnPtrWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;
 
     unsigned m_inLiveResize : 1;
 
     unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
 
     unsigned m_scrollOriginChanged : 1;
 
     unsigned m_horizontalScrollbarNeedsPaintInvalidation : 1;
     unsigned m_verticalScrollbarNeedsPaintInvalidation : 1;
     unsigned m_scrollCornerNeedsPaintInvalidation : 1;
 
     // There are 8 possible combinations of writing mode and direction. Scroll origin will be non-zero in the x or y axis
     // if there is any reversed direction or writing-mode. The combinations are:
     // writing-mode / direction     scrollOrigin.x() set    scrollOrigin.y() set
     // horizontal-tb / ltr          NO                      NO
     // horizontal-tb / rtl          YES                     NO
     // horizontal-bt / ltr          NO                      YES
     // horizontal-bt / rtl          YES                     YES
     // vertical-lr / ltr            NO                      NO
     // vertical-lr / rtl            NO                      YES
     // vertical-rl / ltr            YES                     NO
     // vertical-rl / rtl            YES                     YES
     IntPoint m_scrollOrigin;
 };
 
 } // namespace blink
 
 #endif // ScrollableArea_h