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

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

Issue 551253002: Web Animations: Zero time of the document timeline should correspond with navigationStart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Specify time when resetting animation clock in tests. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/animation/AnimationTest.cpp ('k') | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 73
74 #if !ENABLE(OILPAN) 74 #if !ENABLE(OILPAN)
75 void playerDestroyed(AnimationPlayer* player) 75 void playerDestroyed(AnimationPlayer* player)
76 { 76 {
77 ASSERT(m_players.contains(player)); 77 ASSERT(m_players.contains(player));
78 m_players.remove(player); 78 m_players.remove(player);
79 } 79 }
80 #endif 80 #endif
81 81
82 bool hasPendingUpdates() const { return !m_playersNeedingUpdate.isEmpty(); } 82 bool hasPendingUpdates() const { return !m_playersNeedingUpdate.isEmpty(); }
83 double zeroTime() const { return 0; } 83 double zeroTime();
84 double currentTime(bool& isNull); 84 double currentTime(bool& isNull);
85 double currentTime(); 85 double currentTime();
86 double currentTimeInternal(bool& isNull); 86 double currentTimeInternal(bool& isNull);
87 double currentTimeInternal(); 87 double currentTimeInternal();
88 double effectiveTime(); 88 double effectiveTime();
89 void pauseAnimationsForTesting(double); 89 void pauseAnimationsForTesting(double);
90 90
91 void setOutdatedAnimationPlayer(AnimationPlayer*); 91 void setOutdatedAnimationPlayer(AnimationPlayer*);
92 bool hasOutdatedAnimationPlayer() const; 92 bool hasOutdatedAnimationPlayer() const;
93 93
94 Document* document() { return m_document.get(); } 94 Document* document() { return m_document.get(); }
95 #if !ENABLE(OILPAN) 95 #if !ENABLE(OILPAN)
96 void detachFromDocument(); 96 void detachFromDocument();
97 #endif 97 #endif
98 void wake(); 98 void wake();
99 99
100 void trace(Visitor*); 100 void trace(Visitor*);
101 101
102 protected: 102 protected:
103 AnimationTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>); 103 AnimationTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>);
104 104
105 private: 105 private:
106 RawPtrWillBeMember<Document> m_document; 106 RawPtrWillBeMember<Document> m_document;
107 double m_zeroTime;
107 // AnimationPlayers which will be updated on the next frame 108 // AnimationPlayers which will be updated on the next frame
108 // i.e. current, in effect, or had timing changed 109 // i.e. current, in effect, or had timing changed
109 WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> > m_playersNeedingUpda te; 110 WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> > m_playersNeedingUpda te;
110 WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer> > m_players; 111 WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer> > m_players;
111 112
112 friend class SMILTimeContainer; 113 friend class SMILTimeContainer;
113 static const double s_minimumDelay; 114 static const double s_minimumDelay;
114 115
115 OwnPtrWillBeMember<PlatformTiming> m_timing; 116 OwnPtrWillBeMember<PlatformTiming> m_timing;
116 117
(...skipping 18 matching lines...) Expand all
135 RawPtrWillBeMember<AnimationTimeline> m_timeline; 136 RawPtrWillBeMember<AnimationTimeline> m_timeline;
136 Timer<AnimationTimelineTiming> m_timer; 137 Timer<AnimationTimelineTiming> m_timer;
137 }; 138 };
138 139
139 friend class AnimationAnimationTimelineTest; 140 friend class AnimationAnimationTimelineTest;
140 }; 141 };
141 142
142 } // namespace blink 143 } // namespace blink
143 144
144 #endif 145 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationTest.cpp ('k') | Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698