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

Side by Side Diff: Source/core/animation/Animation.h

Issue 28263002: Plumb timeToNextEffect through players and animation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Moved location of timeToEffectChange calculation 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 return m_compositableValues.get(); 50 return m_compositableValues.get();
51 } 51 }
52 52
53 const AnimationEffect* effect() const { return m_effect.get(); } 53 const AnimationEffect* effect() const { return m_effect.get(); }
54 54
55 protected: 55 protected:
56 virtual void applyEffects(bool previouslyInEffect); 56 virtual void applyEffects(bool previouslyInEffect);
57 virtual void clearEffects(); 57 virtual void clearEffects();
58 virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL; 58 virtual void updateChildrenAndEffects(bool) const OVERRIDE FINAL;
59 virtual void willDetach() OVERRIDE FINAL; 59 virtual void willDetach() OVERRIDE FINAL;
60 virtual double calculateTimeToEffectChange(double inheritedTime, double acti veTime, Phase) const OVERRIDE FINAL;
60 61
61 private: 62 private:
62 Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&, P assOwnPtr<EventDelegate>); 63 Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&, P assOwnPtr<EventDelegate>);
63 64
64 RefPtr<Element> m_target; 65 RefPtr<Element> m_target;
65 RefPtr<AnimationEffect> m_effect; 66 RefPtr<AnimationEffect> m_effect;
66 67
67 bool m_activeInAnimationStack; 68 bool m_activeInAnimationStack;
68 OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues; 69 OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues;
69 }; 70 };
70 71
71 } // namespace WebCore 72 } // namespace WebCore
72 73
73 #endif 74 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/Animation.cpp » ('j') | Source/core/animation/DocumentTimeline.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698