| Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| index 4012cc3909bf315592cbf9925971c9c754849b89..dba7b51df944e1b6723ed976dac3490970a72ae6 100644
|
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -673,7 +673,7 @@ private:
|
|
|
| namespace blink {
|
|
|
| -RawPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(ScrollableArea* scrollableArea)
|
| +ScrollAnimatorBase* ScrollAnimatorBase::create(ScrollableArea* scrollableArea)
|
| {
|
| return new ScrollAnimatorMac(scrollableArea);
|
| }
|
| @@ -686,9 +686,7 @@ ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea)
|
| , m_haveScrolledSincePageLoad(false)
|
| , m_needsScrollerStyleUpdate(false)
|
| {
|
| -#if ENABLE(OILPAN)
|
| ThreadState::current()->registerPreFinalizer(this);
|
| -#endif
|
|
|
| m_scrollAnimationHelperDelegate.adoptNS([[BlinkScrollAnimationHelperDelegate alloc] initWithScrollAnimator:this]);
|
| m_scrollAnimationHelper.adoptNS([[NSClassFromString(@"NSScrollAnimationHelper") alloc] initWithDelegate:m_scrollAnimationHelperDelegate.get()]);
|
| @@ -701,9 +699,6 @@ ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea)
|
|
|
| ScrollAnimatorMac::~ScrollAnimatorMac()
|
| {
|
| -#if !ENABLE(OILPAN)
|
| - dispose();
|
| -#endif
|
| }
|
|
|
| void ScrollAnimatorMac::dispose()
|
|
|