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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.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: address review feedback 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
« third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp ('K') | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f91bc0ff01e9bbcd0b41e2c11f60264744ee9243..bcaa0af5a96bfb0b3fea585083c57811a467f130 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
@@ -94,9 +94,9 @@ ScrollableArea::~ScrollableArea()
void ScrollableArea::clearScrollAnimators()
{
-#if OS(MACOSX) && ENABLE(OILPAN)
+#if ENABLE(OILPAN)
if (m_scrollAnimator)
- m_scrollAnimator->dispose();
+ m_scrollAnimator->clearScrollAnimator();
#endif
m_scrollAnimator.clear();
m_programmaticScrollAnimator.clear();
« third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp ('K') | « third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698