Chromium Code Reviews

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 96 matching lines...)
107 ScriptPromise ready(ScriptState*); 107 ScriptPromise ready(ScriptState*);
108 108
109 bool playing() const { return !(playStateInternal() == Idle || limited() || m_paused || m_isPausedForTesting); } 109 bool playing() const { return !(playStateInternal() == Idle || limited() || m_paused || m_isPausedForTesting); }
110 bool limited() const { return limited(currentTimeInternal()); } 110 bool limited() const { return limited(currentTimeInternal()); }
111 bool finishedInternal() const { return m_finished; } 111 bool finishedInternal() const { return m_finished; }
112 112
113 DEFINE_ATTRIBUTE_EVENT_LISTENER(finish); 113 DEFINE_ATTRIBUTE_EVENT_LISTENER(finish);
114 DEFINE_ATTRIBUTE_EVENT_LISTENER(cancel); 114 DEFINE_ATTRIBUTE_EVENT_LISTENER(cancel);
115 115
116 const AtomicString& interfaceName() const override; 116 const AtomicString& interfaceName() const override;
117 ExecutionContext* executionContext() const override; 117 ExecutionContext* getExecutionContext() const override;
118 bool hasPendingActivity() const override; 118 bool hasPendingActivity() const override;
119 void contextDestroyed() override; 119 void contextDestroyed() override;
120 120
121 double playbackRate() const; 121 double playbackRate() const;
122 void setPlaybackRate(double); 122 void setPlaybackRate(double);
123 const AnimationTimeline* timeline() const { return m_timeline; } 123 const AnimationTimeline* timeline() const { return m_timeline; }
124 AnimationTimeline* timeline() { return m_timeline; } 124 AnimationTimeline* timeline() { return m_timeline; }
125 125
126 double calculateStartTime(double currentTime) const; 126 double calculateStartTime(double currentTime) const;
127 bool hasStartTime() const { return !isNull(m_startTime); } 127 bool hasStartTime() const { return !isNull(m_startTime); }
(...skipping 168 matching lines...)
296 296
297 OwnPtr<CompositorAnimationPlayer> m_compositorPlayer; 297 OwnPtr<CompositorAnimationPlayer> m_compositorPlayer;
298 298
299 bool m_currentTimePending; 299 bool m_currentTimePending;
300 bool m_stateIsBeingUpdated; 300 bool m_stateIsBeingUpdated;
301 }; 301 };
302 302
303 } // namespace blink 303 } // namespace blink
304 304
305 #endif // Animation_h 305 #endif // Animation_h
OLDNEW

Powered by Google App Engine