| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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) | 113 if (m_timeline) |
| 114 m_timeline->playerDestroyed(this); | 114 m_timeline->playerDestroyed(this); |
| 115 #endif | 115 #endif |
| 116 | 116 |
| 117 destroyCompositorPlayer(); | 117 destroyCompositorPlayer(); |
| 118 } | 118 } |
| 119 | 119 |
| 120 #if !ENABLE(OILPAN) |
| 121 void AnimationPlayer::detachFromTimeline() |
| 122 { |
| 123 dispose(); |
| 124 m_timeline = nullptr; |
| 125 } |
| 126 #endif |
| 127 |
| 120 double AnimationPlayer::sourceEnd() const | 128 double AnimationPlayer::sourceEnd() const |
| 121 { | 129 { |
| 122 return m_content ? m_content->endTimeInternal() : 0; | 130 return m_content ? m_content->endTimeInternal() : 0; |
| 123 } | 131 } |
| 124 | 132 |
| 125 bool AnimationPlayer::limited(double currentTime) const | 133 bool AnimationPlayer::limited(double currentTime) const |
| 126 { | 134 { |
| 127 return (m_playbackRate < 0 && currentTime <= 0) || (m_playbackRate > 0 && cu
rrentTime >= sourceEnd()); | 135 return (m_playbackRate < 0 && currentTime <= 0) || (m_playbackRate > 0 && cu
rrentTime >= sourceEnd()); |
| 128 } | 136 } |
| 129 | 137 |
| (...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1015 visitor->trace(m_content); | 1023 visitor->trace(m_content); |
| 1016 visitor->trace(m_timeline); | 1024 visitor->trace(m_timeline); |
| 1017 visitor->trace(m_pendingFinishedEvent); | 1025 visitor->trace(m_pendingFinishedEvent); |
| 1018 visitor->trace(m_finishedPromise); | 1026 visitor->trace(m_finishedPromise); |
| 1019 visitor->trace(m_readyPromise); | 1027 visitor->trace(m_readyPromise); |
| 1020 EventTargetWithInlineData::trace(visitor); | 1028 EventTargetWithInlineData::trace(visitor); |
| 1021 ActiveDOMObject::trace(visitor); | 1029 ActiveDOMObject::trace(visitor); |
| 1022 } | 1030 } |
| 1023 | 1031 |
| 1024 } // namespace | 1032 } // namespace |
| OLD | NEW |