| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 67 |
| 68 void restartAnimationOnCompositor(); | 68 void restartAnimationOnCompositor(); |
| 69 | 69 |
| 70 void updateAnimationFlags(ComputedStyle&); | 70 void updateAnimationFlags(ComputedStyle&); |
| 71 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh
ange = animationStyleChange; } | 71 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh
ange = animationStyleChange; } |
| 72 | 72 |
| 73 const ComputedStyle* baseComputedStyle() const; | 73 const ComputedStyle* baseComputedStyle() const; |
| 74 void updateBaseComputedStyle(const ComputedStyle*); | 74 void updateBaseComputedStyle(const ComputedStyle*); |
| 75 void clearBaseComputedStyle(); | 75 void clearBaseComputedStyle(); |
| 76 | 76 |
| 77 #if !ENABLE(OILPAN) |
| 78 void addEffect(KeyframeEffect* effect) { m_effects.add(effect); } |
| 79 #endif |
| 80 |
| 77 DECLARE_TRACE(); | 81 DECLARE_TRACE(); |
| 78 | 82 |
| 79 private: | 83 private: |
| 80 bool isAnimationStyleChange() const; | 84 bool isAnimationStyleChange() const; |
| 81 | 85 |
| 82 AnimationStack m_defaultStack; | 86 AnimationStack m_defaultStack; |
| 83 CSSAnimations m_cssAnimations; | 87 CSSAnimations m_cssAnimations; |
| 84 AnimationCountedSet m_animations; | 88 AnimationCountedSet m_animations; |
| 85 bool m_animationStyleChange; | 89 bool m_animationStyleChange; |
| 86 RefPtr<ComputedStyle> m_baseComputedStyle; | 90 RefPtr<ComputedStyle> m_baseComputedStyle; |
| 87 | 91 |
| 92 #if !ENABLE(OILPAN) |
| 93 // TODO(oilpan): This is to avoid a reference cycle that keeps Elements |
| 94 // alive and won't be needed once the Node hierarchy becomes traceable. |
| 95 HeapHashSet<WeakMember<KeyframeEffect>> m_effects; |
| 96 #endif |
| 97 |
| 88 // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style chan
ge is due to animation. | 98 // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style chan
ge is due to animation. |
| 89 friend class CSSAnimations; | 99 friend class CSSAnimations; |
| 90 friend class DeferredLegacyStyleInterpolation; | 100 friend class DeferredLegacyStyleInterpolation; |
| 91 }; | 101 }; |
| 92 | 102 |
| 93 } // namespace blink | 103 } // namespace blink |
| 94 | 104 |
| 95 #endif // ElementAnimations_h | 105 #endif // ElementAnimations_h |
| OLD | NEW |