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

Unified Diff: Source/core/animation/Player.cpp

Issue 46043014: Web Animations CSS: Unfreeze AnimationClock if sampling timelines does not trigger style recalc (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reinstate assert Created 7 years, 1 month 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: Source/core/animation/Player.cpp
diff --git a/Source/core/animation/Player.cpp b/Source/core/animation/Player.cpp
index c3f14493ddf8689672d643ee443644918d12f6a1..35f7d97f7e1fd439150e2ee9e2b0e7a6c24fd6c0 100644
--- a/Source/core/animation/Player.cpp
+++ b/Source/core/animation/Player.cpp
@@ -90,18 +90,22 @@ double Player::currentTime() const
return currentTimeBeforeDrift() - timeDrift();
}
-bool Player::update(double* timeToEffectChange)
+bool Player::update(double* timeToEffectChange, bool* didTriggerStyleRecalc)
{
if (!m_content) {
if (timeToEffectChange)
*timeToEffectChange = std::numeric_limits<double>::infinity();
+ if (didTriggerStyleRecalc)
+ *didTriggerStyleRecalc = false;
return false;
}
double newTime = isNull(m_timeline.currentTime()) ? nullValue() : currentTime();
- m_content->updateInheritedTime(newTime);
+ bool didTriggerStyleRecalcLocal = m_content->updateInheritedTime(newTime);
if (timeToEffectChange)
*timeToEffectChange = m_content->timeToEffectChange();
+ if (didTriggerStyleRecalc)
+ *didTriggerStyleRecalc = didTriggerStyleRecalcLocal;
return m_content->isCurrent() || m_content->isInEffect();
}

Powered by Google App Engine
This is Rietveld 408576698