| 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 6f940cb75decad84a1bb1ab2c93ed210adf89f45..458ac7fe7add02c96d0958fb9ae442a040db1ae0 100644
|
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -689,10 +689,6 @@ 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()]);
|
|
|
| @@ -724,6 +720,7 @@ void ScrollAnimatorMac::dispose()
|
| }
|
| m_initialScrollbarPaintTimer.stop();
|
| m_sendContentAreaScrolledTimer.stop();
|
| + ScrollAnimatorCompositorCoordinator::dispose();
|
| }
|
|
|
| ScrollResultOneDimensional ScrollAnimatorMac::userScroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float delta)
|
|
|