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

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

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
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/animation/Animation.h » ('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 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/animation/ActiveAnimations.h" 32 #include "core/animation/ActiveAnimations.h"
33 33
34 #include "core/rendering/RenderObject.h" 34 #include "core/rendering/RenderObject.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 ActiveAnimations::~ActiveAnimations() 38 ActiveAnimations::~ActiveAnimations()
39 { 39 {
40 #if !ENABLE(OILPAN)
40 for (size_t i = 0; i < m_animations.size(); ++i) 41 for (size_t i = 0; i < m_animations.size(); ++i)
41 m_animations[i]->notifyElementDestroyed(); 42 m_animations[i]->notifyElementDestroyed();
42 m_animations.clear(); 43 m_animations.clear();
44 #endif
43 } 45 }
44 46
45 void ActiveAnimations::addPlayer(AnimationPlayer* player) 47 void ActiveAnimations::addPlayer(AnimationPlayer* player)
46 { 48 {
47 ++m_players.add(player, 0).storedValue->value; 49 ++m_players.add(player, 0).storedValue->value;
48 } 50 }
49 51
50 void ActiveAnimations::removePlayer(AnimationPlayer* player) 52 void ActiveAnimations::removePlayer(AnimationPlayer* player)
51 { 53 {
52 AnimationPlayerCountedSet::iterator it = m_players.find(player); 54 AnimationPlayerCountedSet::iterator it = m_players.find(player);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 87
86 void ActiveAnimations::cancelAnimationOnCompositor() 88 void ActiveAnimations::cancelAnimationOnCompositor()
87 { 89 {
88 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla yers.end(); ++it) 90 for (AnimationPlayerCountedSet::iterator it = m_players.begin(); it != m_pla yers.end(); ++it)
89 it->key->cancelAnimationOnCompositor(); 91 it->key->cancelAnimationOnCompositor();
90 } 92 }
91 93
92 void ActiveAnimations::trace(Visitor* visitor) 94 void ActiveAnimations::trace(Visitor* visitor)
93 { 95 {
94 visitor->trace(m_cssAnimations); 96 visitor->trace(m_cssAnimations);
95 #if ENABLE(OILPAN) 97 visitor->trace(m_defaultStack);
96 visitor->trace(m_target); 98 visitor->trace(m_players);
97 #endif
98 } 99 }
99 100
100 } // namespace WebCore 101 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/animation/ActiveAnimations.h ('k') | Source/core/animation/Animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698