Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
index bc261b77f4d9b0381eccf2bf36d5478dd6b6bae6..3e41aec1c18f4212ed44a20cba923cb42283dfaf 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.h |
@@ -126,13 +126,10 @@ public: |
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; } |
@@ -278,7 +275,7 @@ public: |
// Need to promptly let go of owned animator objects. |
EAGERLY_FINALIZE(); |
- DEFINE_INLINE_VIRTUAL_TRACE() { } |
+ DECLARE_VIRTUAL_TRACE(); |
protected: |
ScrollableArea(); |
@@ -325,12 +322,8 @@ private: |
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 PersistentWillBeMember<ProgrammaticScrollAnimator> m_programmaticScrollAnimator; |
unsigned m_inLiveResize : 1; |