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

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, 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 | Annotate | Revision Log
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 // Animations that are currently active for this element, their effects will be applied 58 // Animations that are currently active for this element, their effects will be applied
59 // during a style recalc. CSS Transitions are included in this stack. 59 // during a style recalc. CSS Transitions are included in this stack.
60 AnimationStack& defaultStack() { return m_defaultStack; } 60 AnimationStack& defaultStack() { return m_defaultStack; }
61 // Tracks the state of active CSS Animations and Transitions. The individual animations 61 // Tracks the state of active CSS Animations and Transitions. The individual animations
62 // will also be part of the default stack, but the mapping betwen animation name and 62 // will also be part of the default stack, but the mapping betwen animation name and
63 // player is kept here. 63 // player is kept here.
64 CSSAnimations& cssAnimations() { return m_cssAnimations; } 64 CSSAnimations& cssAnimations() { return m_cssAnimations; }
65 const CSSAnimations& cssAnimations() const { return m_cssAnimations; } 65 const CSSAnimations& cssAnimations() const { return m_cssAnimations; }
66 66
67 typedef HashMap<AnimationPlayer*, int> AnimationPlayerCountedSet; 67 typedef WillBeHeapHashMap<RawPtrWillBeMember<AnimationPlayer>, int> Animatio nPlayerCountedSet;
Mads Ager (chromium) 2014/04/29 10:29:41 Maybe rename the type to AnimationPlayerSet since
Timothy Loh 2014/05/02 05:46:00 This should probably be a weak member.
haraken 2014/05/04 15:31:47 Agreed, this should be a weak member.
68 // AnimationPlayers which have animations targeting this element. 68 // AnimationPlayers which have animations targeting this element.
69 const AnimationPlayerCountedSet& players() const { return m_players; } 69 const AnimationPlayerCountedSet& players() const { return m_players; }
70 void addPlayer(AnimationPlayer*); 70 void addPlayer(AnimationPlayer*);
71 void removePlayer(AnimationPlayer*); 71 void removePlayer(AnimationPlayer*);
72 72
73 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_animations.isEmpty(); } 73 bool isEmpty() const { return m_defaultStack.isEmpty() && m_cssAnimations.is Empty() && m_animations.isEmpty(); }
74 74
75 void cancelAnimationOnCompositor(); 75 void cancelAnimationOnCompositor();
76 76
77 void updateAnimationFlags(RenderStyle&); 77 void updateAnimationFlags(RenderStyle&);
(...skipping 16 matching lines...) Expand all
94 // won't be needed once Element and Animation are moved to Oilpan. 94 // won't be needed once Element and Animation are moved to Oilpan.
95 Vector<Animation*> m_animations; 95 Vector<Animation*> m_animations;
96 96
97 // CSSAnimations checks if a style change is due to animation. 97 // CSSAnimations checks if a style change is due to animation.
98 friend class CSSAnimations; 98 friend class CSSAnimations;
99 }; 99 };
100 100
101 } // namespace WebCore 101 } // namespace WebCore
102 102
103 #endif 103 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/animation/ActiveAnimations.cpp » ('j') | Source/core/animation/Animation.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698