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

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

Issue 225073004: Oilpan: Completely move core/animations/ to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/animation/ActiveAnimations.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 // 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
56 // during a style recalc. CSS Transitions are included in this stack. 56 // during a style recalc. CSS Transitions are included in this stack.
57 AnimationStack& defaultStack() { return m_defaultStack; } 57 AnimationStack& defaultStack() { return m_defaultStack; }
58 // Tracks the state of active CSS Animations and Transitions. The individual animations 58 // Tracks the state of active CSS Animations and Transitions. The individual animations
59 // will also be part of the default stack, but the mapping betwen animation name and 59 // will also be part of the default stack, but the mapping betwen animation name and
60 // player is kept here. 60 // player is kept here.
61 CSSAnimations& cssAnimations() { return m_cssAnimations; } 61 CSSAnimations& cssAnimations() { return m_cssAnimations; }
62 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } 62 const CSSAnimations& cssAnimations() const { return m_cssAnimations; }
63 63
64 typedef HashCountedSet<AnimationPlayer*> AnimationPlayerSet; 64 typedef WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer> > Animatio nPlayerSet;
dstockwell 2014/04/15 05:02:43 Is there a HeapHashCountedSet? Although we don't r
haraken 2014/04/15 05:03:56 Not yet, and that means that we need to implement
65 // AnimationPlayers which have animations targeting this element. 65 // AnimationPlayers which have animations targeting this element.
66 const AnimationPlayerSet& players() const { return m_players; } 66 const AnimationPlayerSet& players() const { return m_players; }
67 AnimationPlayerSet& players() { return m_players; } 67 AnimationPlayerSet& players() { return m_players; }
68 68
69 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty(); } 69 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty(); }
70 70
71 void cancelAnimationOnCompositor(); 71 void cancelAnimationOnCompositor();
72 72
73 void updateAnimationFlags(RenderStyle&); 73 void updateAnimationFlags(RenderStyle&);
74 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh ange = animationStyleChange; } 74 void setAnimationStyleChange(bool animationStyleChange) { m_animationStyleCh ange = animationStyleChange; }
75 75
76 void trace(Visitor*); 76 void trace(Visitor*);
77 77
78 private: 78 private:
79 bool isAnimationStyleChange() const { return m_animationStyleChange; } 79 bool isAnimationStyleChange() const { return m_animationStyleChange; }
80 80
81 AnimationStack m_defaultStack; 81 AnimationStack m_defaultStack;
82 CSSAnimations m_cssAnimations; 82 CSSAnimations m_cssAnimations;
83 AnimationPlayerSet m_players; 83 AnimationPlayerSet m_players;
84 bool m_animationStyleChange; 84 bool m_animationStyleChange;
85 85
86 // CSSAnimations checks if a style change is due to animation. 86 // CSSAnimations checks if a style change is due to animation.
87 friend class CSSAnimations; 87 friend class CSSAnimations;
88 }; 88 };
89 89
90 } // namespace WebCore 90 } // namespace WebCore
91 91
92 #endif 92 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/ActiveAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698