| OLD | NEW | 
|    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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   54 class ExceptionState; |   54 class ExceptionState; | 
|   55  |   55  | 
|   56 class CORE_EXPORT Animation final |   56 class CORE_EXPORT Animation final | 
|   57     : public RefCountedGarbageCollectedEventTargetWithInlineData<Animation> |   57     : public RefCountedGarbageCollectedEventTargetWithInlineData<Animation> | 
|   58     , public ActiveScriptWrappable |   58     , public ActiveScriptWrappable | 
|   59     , public ActiveDOMObject |   59     , public ActiveDOMObject | 
|   60     , public CompositorAnimationDelegate |   60     , public CompositorAnimationDelegate | 
|   61     , public CompositorAnimationPlayerClient { |   61     , public CompositorAnimationPlayerClient { | 
|   62     DEFINE_WRAPPERTYPEINFO(); |   62     DEFINE_WRAPPERTYPEINFO(); | 
|   63     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(Animation); |   63     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(Animation); | 
|   64     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Animation); |   64     USING_GARBAGE_COLLECTED_MIXIN(Animation); | 
|   65 public: |   65 public: | 
|   66     enum AnimationPlayState { |   66     enum AnimationPlayState { | 
|   67         Unset, |   67         Unset, | 
|   68         Idle, |   68         Idle, | 
|   69         Pending, |   69         Pending, | 
|   70         Running, |   70         Running, | 
|   71         Paused, |   71         Paused, | 
|   72         Finished |   72         Finished | 
|   73     }; |   73     }; | 
|   74  |   74  | 
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  174     int compositorGroup() const { return m_compositorGroup; } |  174     int compositorGroup() const { return m_compositorGroup; } | 
|  175  |  175  | 
|  176     static bool hasLowerPriority(const Animation* animation1, const Animation* a
     nimation2) |  176     static bool hasLowerPriority(const Animation* animation1, const Animation* a
     nimation2) | 
|  177     { |  177     { | 
|  178         return animation1->sequenceNumber() < animation2->sequenceNumber(); |  178         return animation1->sequenceNumber() < animation2->sequenceNumber(); | 
|  179     } |  179     } | 
|  180  |  180  | 
|  181     DECLARE_VIRTUAL_TRACE(); |  181     DECLARE_VIRTUAL_TRACE(); | 
|  182  |  182  | 
|  183 protected: |  183 protected: | 
|  184     DispatchEventResult dispatchEventInternal(PassRefPtrWillBeRawPtr<Event>) ove
     rride; |  184     DispatchEventResult dispatchEventInternal(RawPtr<Event>) override; | 
|  185     bool addEventListenerInternal(const AtomicString& eventType, PassRefPtrWillB
     eRawPtr<EventListener>, const EventListenerOptions&) override; |  185     bool addEventListenerInternal(const AtomicString& eventType, RawPtr<EventLis
     tener>, const EventListenerOptions&) override; | 
|  186  |  186  | 
|  187 private: |  187 private: | 
|  188     Animation(ExecutionContext*, AnimationTimeline&, AnimationEffect*); |  188     Animation(ExecutionContext*, AnimationTimeline&, AnimationEffect*); | 
|  189  |  189  | 
|  190     void clearOutdated(); |  190     void clearOutdated(); | 
|  191  |  191  | 
|  192     double effectEnd() const; |  192     double effectEnd() const; | 
|  193     bool limited(double currentTime) const; |  193     bool limited(double currentTime) const; | 
|  194  |  194  | 
|  195     AnimationPlayState calculatePlayState(); |  195     AnimationPlayState calculatePlayState(); | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  236     bool m_isCompositedAnimationDisabledForTesting; |  236     bool m_isCompositedAnimationDisabledForTesting; | 
|  237  |  237  | 
|  238     // This indicates timing information relevant to the animation's effect |  238     // This indicates timing information relevant to the animation's effect | 
|  239     // has changed by means other than the ordinary progression of time |  239     // has changed by means other than the ordinary progression of time | 
|  240     bool m_outdated; |  240     bool m_outdated; | 
|  241  |  241  | 
|  242     bool m_finished; |  242     bool m_finished; | 
|  243     // Holds a 'finished' event queued for asynchronous dispatch via the |  243     // Holds a 'finished' event queued for asynchronous dispatch via the | 
|  244     // ScriptedAnimationController. This object remains active until the |  244     // ScriptedAnimationController. This object remains active until the | 
|  245     // event is actually dispatched. |  245     // event is actually dispatched. | 
|  246     RefPtrWillBeMember<Event> m_pendingFinishedEvent; |  246     Member<Event> m_pendingFinishedEvent; | 
|  247  |  247  | 
|  248     RefPtrWillBeMember<Event> m_pendingCancelledEvent; |  248     Member<Event> m_pendingCancelledEvent; | 
|  249  |  249  | 
|  250     enum CompositorAction { |  250     enum CompositorAction { | 
|  251         None, |  251         None, | 
|  252         Pause, |  252         Pause, | 
|  253         Start, |  253         Start, | 
|  254         PauseThenStart |  254         PauseThenStart | 
|  255     }; |  255     }; | 
|  256  |  256  | 
|  257     class CompositorState { |  257     class CompositorState { | 
|  258         USING_FAST_MALLOC(CompositorState); |  258         USING_FAST_MALLOC(CompositorState); | 
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  298  |  298  | 
|  299     OwnPtr<CompositorAnimationPlayer> m_compositorPlayer; |  299     OwnPtr<CompositorAnimationPlayer> m_compositorPlayer; | 
|  300  |  300  | 
|  301     bool m_currentTimePending; |  301     bool m_currentTimePending; | 
|  302     bool m_stateIsBeingUpdated; |  302     bool m_stateIsBeingUpdated; | 
|  303 }; |  303 }; | 
|  304  |  304  | 
|  305 } // namespace blink |  305 } // namespace blink | 
|  306  |  306  | 
|  307 #endif // Animation_h |  307 #endif // Animation_h | 
| OLD | NEW |