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

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

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 unified diff | Download patch | Annotate | Revision Log
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 const AnimationEffect::CompositableValueMap* compositableValues() const 49 const AnimationEffect::CompositableValueMap* compositableValues() const
50 { 50 {
51 ASSERT(m_compositableValues); 51 ASSERT(m_compositableValues);
52 return m_compositableValues.get(); 52 return m_compositableValues.get();
53 } 53 }
54 54
55 const AnimationEffect* effect() const { return m_effect.get(); } 55 const AnimationEffect* effect() const { return m_effect.get(); }
56 Priority priority() const { return m_priority; } 56 Priority priority() const { return m_priority; }
57 57
58 protected: 58 protected:
59 virtual void applyEffects(bool previouslyInEffect); 59 // Returns whether style recalc was triggered.
60 virtual bool applyEffects(bool previouslyInEffect);
60 virtual void clearEffects(); 61 virtual void clearEffects();
61 virtual void updateChildrenAndEffects() const OVERRIDE FINAL; 62 virtual bool updateChildrenAndEffects() const OVERRIDE FINAL;
62 virtual void willDetach() OVERRIDE FINAL; 63 virtual void willDetach() OVERRIDE FINAL;
63 virtual double calculateTimeToEffectChange(double inheritedTime, double acti veTime, Phase) const OVERRIDE FINAL; 64 virtual double calculateTimeToEffectChange(double inheritedTime, double acti veTime, Phase) const OVERRIDE FINAL;
64 65
65 private: 66 private:
66 Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&, P riority, PassOwnPtr<EventDelegate>); 67 Animation(PassRefPtr<Element>, PassRefPtr<AnimationEffect>, const Timing&, P riority, PassOwnPtr<EventDelegate>);
67 68
68 RefPtr<Element> m_target; 69 RefPtr<Element> m_target;
69 RefPtr<AnimationEffect> m_effect; 70 RefPtr<AnimationEffect> m_effect;
70 71
71 bool m_activeInAnimationStack; 72 bool m_activeInAnimationStack;
72 OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues; 73 OwnPtr<AnimationEffect::CompositableValueMap> m_compositableValues;
73 74
74 Priority m_priority; 75 Priority m_priority;
75 }; 76 };
76 77
77 } // namespace WebCore 78 } // namespace WebCore
78 79
79 #endif 80 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698