Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Side by Side Diff: Source/core/animation/ElementAnimations.h

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Intentional nullptr access Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
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 26 matching lines...) Expand all
37 #include "wtf/HashMap.h" 37 #include "wtf/HashMap.h"
38 #include "wtf/RefPtr.h" 38 #include "wtf/RefPtr.h"
39 #include "wtf/Vector.h" 39 #include "wtf/Vector.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 class CSSAnimations; 43 class CSSAnimations;
44 44
45 using AnimationCountedSet = WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<Anim ation>>; 45 using AnimationCountedSet = WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<Anim ation>>;
46 46
47 class ElementAnimations : public NoBaseWillBeGarbageCollectedFinalized<ElementAn imations> { 47 class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> {
48 WTF_MAKE_NONCOPYABLE(ElementAnimations); 48 WTF_MAKE_NONCOPYABLE(ElementAnimations);
49 USING_PRE_FINALIZER(ElementAnimations, dispose);
49 public: 50 public:
50 ElementAnimations(); 51 ElementAnimations();
51 ~ElementAnimations(); 52 ~ElementAnimations();
53 void dispose();
52 54
53 // Animations that are currently active for this element, their effects will be applied 55 // Animations that are currently active for this element, their effects will be applied
54 // during a style recalc. CSS Transitions are included in this stack. 56 // during a style recalc. CSS Transitions are included in this stack.
55 AnimationStack& defaultStack() { return m_defaultStack; } 57 AnimationStack& defaultStack() { return m_defaultStack; }
56 const AnimationStack& defaultStack() const { return m_defaultStack; } 58 const AnimationStack& defaultStack() const { return m_defaultStack; }
57 // Tracks the state of active CSS Animations and Transitions. The individual animations 59 // Tracks the state of active CSS Animations and Transitions. The individual animations
58 // will also be part of the default stack, but the mapping betwen animation name and 60 // will also be part of the default stack, but the mapping betwen animation name and
59 // animation is kept here. 61 // animation is kept here.
60 CSSAnimations& cssAnimations() { return m_cssAnimations; } 62 CSSAnimations& cssAnimations() { return m_cssAnimations; }
61 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } 63 const CSSAnimations& cssAnimations() const { return m_cssAnimations; }
(...skipping 24 matching lines...) Expand all
86 88
87 AnimationStack m_defaultStack; 89 AnimationStack m_defaultStack;
88 CSSAnimations m_cssAnimations; 90 CSSAnimations m_cssAnimations;
89 AnimationCountedSet m_animations; 91 AnimationCountedSet m_animations;
90 bool m_animationStyleChange; 92 bool m_animationStyleChange;
91 RefPtr<ComputedStyle> m_baseComputedStyle; 93 RefPtr<ComputedStyle> m_baseComputedStyle;
92 94
93 #if !ENABLE(OILPAN) 95 #if !ENABLE(OILPAN)
94 // FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements ali ve 96 // FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements ali ve
95 // and won't be needed once the Node hierarchy becomes traceable. 97 // and won't be needed once the Node hierarchy becomes traceable.
96 Vector<KeyframeEffect*> m_effects; 98 HeapVector<Member<KeyframeEffect>> m_effects;
97 #endif 99 #endif
98 100
99 // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style chan ge is due to animation. 101 // CSSAnimations and DeferredLegacyStyleInterpolation checks if a style chan ge is due to animation.
100 friend class CSSAnimations; 102 friend class CSSAnimations;
101 friend class DeferredLegacyStyleInterpolation; 103 friend class DeferredLegacyStyleInterpolation;
102 }; 104 };
103 105
104 } // namespace blink 106 } // namespace blink
105 107
106 #endif // ElementAnimations_h 108 #endif // ElementAnimations_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698