| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| index 917fc2331f551d63f6eac2bc3ba58367dee97d21..3a90c1ec967b68053b78334e54f73bb9d9a61b1b 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
|
| @@ -21,6 +21,9 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
|
| , m_compositorAnimationId(0)
|
| , m_compositorAnimationGroupId(0)
|
| {
|
| +#if ENABLE(OILPAN)
|
| + ThreadState::current()->registerPreFinalizer(this);
|
| +#endif
|
| if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled()) {
|
| ASSERT(Platform::current()->compositorSupport());
|
| m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
|
| @@ -31,6 +34,13 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
|
|
|
| ScrollAnimatorCompositorCoordinator::~ScrollAnimatorCompositorCoordinator()
|
| {
|
| +#if !ENABLE(OILPAN)
|
| + ScrollAnimatorCompositorCoordinator::dispose();
|
| +#endif
|
| +}
|
| +
|
| +void ScrollAnimatorCompositorCoordinator::dispose()
|
| +{
|
| if (m_compositorPlayer) {
|
| m_compositorPlayer->setAnimationDelegate(nullptr);
|
| m_compositorPlayer.clear();
|
|
|