| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 public: | 45 public: |
| 46 void add(Animation* animation) { m_activeAnimations.append(animation); } | 46 void add(Animation* animation) { m_activeAnimations.append(animation); } |
| 47 void remove(Animation* animation) | 47 void remove(Animation* animation) |
| 48 { | 48 { |
| 49 size_t position = m_activeAnimations.find(animation); | 49 size_t position = m_activeAnimations.find(animation); |
| 50 ASSERT(position != kNotFound); | 50 ASSERT(position != kNotFound); |
| 51 m_activeAnimations.remove(position); | 51 m_activeAnimations.remove(position); |
| 52 } | 52 } |
| 53 bool isEmpty() const { return m_activeAnimations.isEmpty(); } | 53 bool isEmpty() const { return m_activeAnimations.isEmpty(); } |
| 54 bool affects(CSSPropertyID) const; |
| 55 bool hasActiveAnimationsOnCompositor(CSSPropertyID) const; |
| 54 static AnimationEffect::CompositableValueMap compositableValues(const Animat
ionStack*, const Vector<InertAnimation*>* newAnimations, const HashSet<const Pla
yer*>* cancelledPlayers, Animation::Priority); | 56 static AnimationEffect::CompositableValueMap compositableValues(const Animat
ionStack*, const Vector<InertAnimation*>* newAnimations, const HashSet<const Pla
yer*>* cancelledPlayers, Animation::Priority); |
| 55 | 57 |
| 56 private: | 58 private: |
| 57 Vector<Animation*> m_activeAnimations; | 59 Vector<Animation*> m_activeAnimations; |
| 58 }; | 60 }; |
| 59 | 61 |
| 60 } // namespace WebCore | 62 } // namespace WebCore |
| 61 | 63 |
| 62 #endif | 64 #endif |
| OLD | NEW |