| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  57     // Returns whether we are waiting for an animation to start and should |  57     // Returns whether we are waiting for an animation to start and should | 
|  58     // service again on the next frame. |  58     // service again on the next frame. | 
|  59     bool update(bool startOnCompositor = true); |  59     bool update(bool startOnCompositor = true); | 
|  60     void notifyCompositorAnimationStarted(double monotonicAnimationStartTime, in
    t compositorGroup = 0); |  60     void notifyCompositorAnimationStarted(double monotonicAnimationStartTime, in
    t compositorGroup = 0); | 
|  61  |  61  | 
|  62     DECLARE_TRACE(); |  62     DECLARE_TRACE(); | 
|  63  |  63  | 
|  64 private: |  64 private: | 
|  65     void timerFired(Timer<CompositorPendingAnimations>*) { update(false); } |  65     void timerFired(Timer<CompositorPendingAnimations>*) { update(false); } | 
|  66  |  66  | 
|  67     PersistentHeapVectorWillBeHeapVector<Member<Animation>> m_pending; |  67     HeapVector<Member<Animation>> m_pending; | 
|  68     PersistentHeapVectorWillBeHeapVector<Member<Animation>> m_waitingForComposit
    orAnimationStart; |  68     HeapVector<Member<Animation>> m_waitingForCompositorAnimationStart; | 
|  69     Timer<CompositorPendingAnimations> m_timer; |  69     Timer<CompositorPendingAnimations> m_timer; | 
|  70     int m_compositorGroup; |  70     int m_compositorGroup; | 
|  71 }; |  71 }; | 
|  72  |  72  | 
|  73 } // namespace blink |  73 } // namespace blink | 
|  74  |  74  | 
|  75 #endif |  75 #endif | 
| OLD | NEW |