OLD | NEW |
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 if (m_timeline) | 113 if (m_timeline) |
114 m_timeline->animationDestroyed(this); | 114 m_timeline->animationDestroyed(this); |
115 #endif | 115 #endif |
116 | 116 |
117 destroyCompositorPlayer(); | 117 destroyCompositorPlayer(); |
118 } | 118 } |
119 | 119 |
120 #if !ENABLE(OILPAN) | 120 #if !ENABLE(OILPAN) |
121 void Animation::detachFromTimeline() | 121 void Animation::detachFromTimeline() |
122 { | 122 { |
123 dispose(); | |
124 m_timeline = nullptr; | 123 m_timeline = nullptr; |
| 124 ActiveDOMObject::clearContext(); |
125 } | 125 } |
126 #endif | 126 #endif |
127 | 127 |
128 double Animation::sourceEnd() const | 128 double Animation::sourceEnd() const |
129 { | 129 { |
130 return m_content ? m_content->endTimeInternal() : 0; | 130 return m_content ? m_content->endTimeInternal() : 0; |
131 } | 131 } |
132 | 132 |
133 bool Animation::limited(double currentTime) const | 133 bool Animation::limited(double currentTime) const |
134 { | 134 { |
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1024 visitor->trace(m_content); | 1024 visitor->trace(m_content); |
1025 visitor->trace(m_timeline); | 1025 visitor->trace(m_timeline); |
1026 visitor->trace(m_pendingFinishedEvent); | 1026 visitor->trace(m_pendingFinishedEvent); |
1027 visitor->trace(m_finishedPromise); | 1027 visitor->trace(m_finishedPromise); |
1028 visitor->trace(m_readyPromise); | 1028 visitor->trace(m_readyPromise); |
1029 EventTargetWithInlineData::trace(visitor); | 1029 EventTargetWithInlineData::trace(visitor); |
1030 ActiveDOMObject::trace(visitor); | 1030 ActiveDOMObject::trace(visitor); |
1031 } | 1031 } |
1032 | 1032 |
1033 } // namespace | 1033 } // namespace |
OLD | NEW |