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

Unified Diff: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.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
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
index 2d73c4776342ba224bd772133e0f9817b2f6aae6..0ecf8b9f98a3360be88cedef6db808244838ff55 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp
@@ -72,8 +72,8 @@ void CompositorAnimationPlayer::NotifyAnimationStarted(
cc::Animation::TargetProperty targetProperty,
int group)
{
- ASSERT(m_delegate);
- m_delegate->notifyAnimationStarted((monotonicTime - base::TimeTicks()).InSecondsF(), group);
+ if (m_delegate)
loyso (OOO) 2016/02/22 23:47:29 I think, these changes are unrelated to your fix.
ymalik 2016/02/23 00:49:33 The premise of this CL is that we need to call set
+ m_delegate->notifyAnimationStarted((monotonicTime - base::TimeTicks()).InSecondsF(), group);
}
void CompositorAnimationPlayer::NotifyAnimationFinished(
@@ -81,8 +81,8 @@ void CompositorAnimationPlayer::NotifyAnimationFinished(
cc::Animation::TargetProperty targetProperty,
int group)
{
- ASSERT(m_delegate);
- m_delegate->notifyAnimationFinished((monotonicTime - base::TimeTicks()).InSecondsF(), group);
+ if (m_delegate)
+ m_delegate->notifyAnimationFinished((monotonicTime - base::TimeTicks()).InSecondsF(), group);
}
void CompositorAnimationPlayer::NotifyAnimationAborted(
@@ -90,8 +90,8 @@ void CompositorAnimationPlayer::NotifyAnimationAborted(
cc::Animation::TargetProperty targetProperty,
int group)
{
- ASSERT(m_delegate);
- m_delegate->notifyAnimationAborted((monotonicTime - base::TimeTicks()).InSecondsF(), group);
+ if (m_delegate)
+ m_delegate->notifyAnimationAborted((monotonicTime - base::TimeTicks()).InSecondsF(), group);
}
} // namespace blink
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698