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

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

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: Build fix 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 m_content->attach(this); 104 m_content->attach(this);
105 } 105 }
106 } 106 }
107 107
108 AnimationPlayer::~AnimationPlayer() 108 AnimationPlayer::~AnimationPlayer()
109 { 109 {
110 #if !ENABLE(OILPAN) 110 #if !ENABLE(OILPAN)
111 if (m_content) 111 if (m_content)
112 m_content->detach(); 112 m_content->detach();
113 if (m_timeline)
114 m_timeline->playerDestroyed(this);
115 #endif 113 #endif
116 114
117 destroyCompositorPlayer(); 115 destroyCompositorPlayer();
118 } 116 }
119 117
120 #if !ENABLE(OILPAN) 118 #if !ENABLE(OILPAN)
121 void AnimationPlayer::detachFromTimeline() 119 void AnimationPlayer::detachFromTimeline()
122 { 120 {
123 dispose(); 121 dispose();
124 m_timeline = nullptr; 122 m_timeline = nullptr;
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 visitor->trace(m_content); 1021 visitor->trace(m_content);
1024 visitor->trace(m_timeline); 1022 visitor->trace(m_timeline);
1025 visitor->trace(m_pendingFinishedEvent); 1023 visitor->trace(m_pendingFinishedEvent);
1026 visitor->trace(m_finishedPromise); 1024 visitor->trace(m_finishedPromise);
1027 visitor->trace(m_readyPromise); 1025 visitor->trace(m_readyPromise);
1028 EventTargetWithInlineData::trace(visitor); 1026 EventTargetWithInlineData::trace(visitor);
1029 ActiveDOMObject::trace(visitor); 1027 ActiveDOMObject::trace(visitor);
1030 } 1028 }
1031 1029
1032 } // namespace 1030 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698