Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

Issue 1714663002: Attempt to fix the crash in blink Scroll Animator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added WILL_BE_USING_PRE_FINALIZER Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698