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

Unified Diff: Source/core/animation/ActiveAnimations.h

Issue 26382004: Web Animations CSS: Implement CSS Transitions backed on Web Animations model (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: update testexpectations and friends Created 7 years, 2 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: Source/core/animation/ActiveAnimations.h
diff --git a/Source/core/animation/ActiveAnimations.h b/Source/core/animation/ActiveAnimations.h
index b57283b770617b2c8f361da2f06f9f1d6f81d94a..c411b5afeda7b7dbf78331d79249e34a2468c332 100644
--- a/Source/core/animation/ActiveAnimations.h
+++ b/Source/core/animation/ActiveAnimations.h
@@ -44,13 +44,10 @@ public:
// Animations that are currently active for this element, their effects will be applied
// during a style recalc.
AnimationStack* defaultStack() { return &m_defaultStack; }
- // Tracks the state of active CSS Animations. The individual animations will also be
- // part of the default stack, but the mapping betwen animation name and player is kept
- // here.
+ // Tracks the state of active CSS Animations and Transitions. The individual animations
+ // will also be part of the default stack, but the mapping betwen animation name and
+ // player is kept here.
CSSAnimations* cssAnimations() { return &m_cssAnimations; }
- // FIXME: Add AnimationStack for CSS Transitions
- // CSS Transitions form a separate animation stack as they apply at a different level of
- // the style cascade. Active transitions will not be present in the default stack.
bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.isEmpty(); }
private:
AnimationStack m_defaultStack;
« no previous file with comments | « LayoutTests/virtual/web-animations-css/animations/change-one-anim-expected.txt ('k') | Source/core/animation/Animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698