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

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

Issue 1080523002: Oilpan: adjust AnimationTimeline finalization. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/core/animation/AnimationPlayer.cpp ('k') | no next file » | 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 m_timing = timing; 77 m_timing = timing;
78 78
79 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->compositorSupport()) 79 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->compositorSupport())
80 m_compositorTimeline = adoptPtr(Platform::current()->compositorSupport() ->createAnimationTimeline()); 80 m_compositorTimeline = adoptPtr(Platform::current()->compositorSupport() ->createAnimationTimeline());
81 81
82 ASSERT(document); 82 ASSERT(document);
83 } 83 }
84 84
85 AnimationTimeline::~AnimationTimeline() 85 AnimationTimeline::~AnimationTimeline()
86 { 86 {
87 for (const auto& player : m_players)
88 player->dispose();
89
90 #if !ENABLE(OILPAN) 87 #if !ENABLE(OILPAN)
91 for (const auto& player : m_players) 88 for (const auto& player : m_players)
92 player->timelineDestroyed(); 89 player->detachFromTimeline();
93 #endif 90 #endif
94 } 91 }
95 92
96 void AnimationTimeline::playerAttached(AnimationPlayer& player) 93 void AnimationTimeline::playerAttached(AnimationPlayer& player)
97 { 94 {
98 ASSERT(player.timeline() == this); 95 ASSERT(player.timeline() == this);
99 ASSERT(!m_players.contains(&player)); 96 ASSERT(!m_players.contains(&player));
100 m_players.add(&player); 97 m_players.add(&player);
101 } 98 }
102 99
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 { 319 {
323 #if ENABLE(OILPAN) 320 #if ENABLE(OILPAN)
324 visitor->trace(m_document); 321 visitor->trace(m_document);
325 visitor->trace(m_timing); 322 visitor->trace(m_timing);
326 visitor->trace(m_playersNeedingUpdate); 323 visitor->trace(m_playersNeedingUpdate);
327 visitor->trace(m_players); 324 visitor->trace(m_players);
328 #endif 325 #endif
329 } 326 }
330 327
331 } // namespace 328 } // namespace
OLDNEW
« no previous file with comments | « Source/core/animation/AnimationPlayer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698