Index: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
index 85016be74b5a15c2f326a65e4254a439ceac12f6..2f7247f84703dc6fd7b135a14ce37a75bc30eab8 100644 |
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp |
@@ -54,7 +54,7 @@ struct SameSizeAsScrollableArea { |
#if ENABLE(ASSERT) && ENABLE(OILPAN) |
VerifyEagerFinalization verifyEager; |
#endif |
- void* pointer; |
+ PersistentWillBeMember<void*> persistent[2]; |
unsigned bitfields : 16; |
IntPoint origin; |
}; |
@@ -89,33 +89,32 @@ ScrollableArea::ScrollableArea() |
ScrollableArea::~ScrollableArea() |
{ |
+ if (m_scrollAnimator) |
+ m_scrollAnimator->cleanup(); |
haraken
2015/12/03 02:45:30
m_scrollAnimator is an on-heap object, so you cann
peria
2015/12/03 03:06:05
Thanks.
Yes! ScrollAnimatorMac::cleanup() must be
|
} |
void ScrollableArea::clearScrollAnimators() |
{ |
- m_animators.clear(); |
+ if (m_scrollAnimator) |
+ m_scrollAnimator->cleanup(); |
+ m_scrollAnimator.clear(); |
+ m_programmaticScrollAnimator.clear(); |
} |
ScrollAnimatorBase* ScrollableArea::scrollAnimator() const |
{ |
- if (!m_animators) |
- m_animators = adoptPtr(new ScrollableAreaAnimators); |
+ if (!m_scrollAnimator) |
+ m_scrollAnimator = ScrollAnimatorBase::create(const_cast<ScrollableArea*>(this)); |
- if (!m_animators->scrollAnimator) |
- m_animators->scrollAnimator = ScrollAnimatorBase::create(const_cast<ScrollableArea*>(this)); |
- |
- return m_animators->scrollAnimator.get(); |
+ return m_scrollAnimator.get(); |
} |
ProgrammaticScrollAnimator* ScrollableArea::programmaticScrollAnimator() const |
{ |
- if (!m_animators) |
- m_animators = adoptPtr(new ScrollableAreaAnimators); |
- |
- if (!m_animators->programmaticScrollAnimator) |
- m_animators->programmaticScrollAnimator = ProgrammaticScrollAnimator::create(const_cast<ScrollableArea*>(this)); |
+ if (!m_programmaticScrollAnimator) |
+ m_programmaticScrollAnimator = ProgrammaticScrollAnimator::create(const_cast<ScrollableArea*>(this)); |
- return m_animators->programmaticScrollAnimator.get(); |
+ return m_programmaticScrollAnimator.get(); |
} |
void ScrollableArea::setScrollOrigin(const IntPoint& origin) |
@@ -584,4 +583,12 @@ IntSize ScrollableArea::excludeScrollbars(const IntSize& size) const |
} |
+DEFINE_TRACE(ScrollableArea) |
+{ |
+#if ENABLE(OILPAN) |
+ visitor->trace(m_scrollAnimator); |
+ visitor->trace(m_programmaticScrollAnimator); |
+#endif |
+} |
+ |
} // namespace blink |