| 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 m_currentTimePending(false), | 103 m_currentTimePending(false), |
| 104 m_stateIsBeingUpdated(false), | 104 m_stateIsBeingUpdated(false), |
| 105 m_effectSuppressed(false) { | 105 m_effectSuppressed(false) { |
| 106 if (m_content) { | 106 if (m_content) { |
| 107 if (m_content->animation()) { | 107 if (m_content->animation()) { |
| 108 m_content->animation()->cancel(); | 108 m_content->animation()->cancel(); |
| 109 m_content->animation()->setEffect(0); | 109 m_content->animation()->setEffect(0); |
| 110 } | 110 } |
| 111 m_content->attach(this); | 111 m_content->attach(this); |
| 112 } | 112 } |
| 113 InspectorInstrumentation::didCreateAnimation(m_timeline->document(), | 113 probe::didCreateAnimation(m_timeline->document(), m_sequenceNumber); |
| 114 m_sequenceNumber); | |
| 115 } | 114 } |
| 116 | 115 |
| 117 Animation::~Animation() { | 116 Animation::~Animation() { |
| 118 // Verify that m_compositorPlayer has been disposed of. | 117 // Verify that m_compositorPlayer has been disposed of. |
| 119 DCHECK(!m_compositorPlayer); | 118 DCHECK(!m_compositorPlayer); |
| 120 } | 119 } |
| 121 | 120 |
| 122 void Animation::dispose() { | 121 void Animation::dispose() { |
| 123 destroyCompositorPlayer(); | 122 destroyCompositorPlayer(); |
| 124 // If the AnimationTimeline and its Animation objects are | 123 // If the AnimationTimeline and its Animation objects are |
| (...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1058 m_animation->setCompositorPending(true); | 1057 m_animation->setCompositorPending(true); |
| 1059 break; | 1058 break; |
| 1060 case DoNotSetCompositorPending: | 1059 case DoNotSetCompositorPending: |
| 1061 break; | 1060 break; |
| 1062 default: | 1061 default: |
| 1063 NOTREACHED(); | 1062 NOTREACHED(); |
| 1064 break; | 1063 break; |
| 1065 } | 1064 } |
| 1066 m_animation->endUpdatingState(); | 1065 m_animation->endUpdatingState(); |
| 1067 | 1066 |
| 1068 if (oldPlayState != newPlayState) | 1067 if (oldPlayState != newPlayState) { |
| 1069 InspectorInstrumentation::animationPlayStateChanged( | 1068 probe::animationPlayStateChanged(m_animation->timeline()->document(), |
| 1070 m_animation->timeline()->document(), m_animation, oldPlayState, | 1069 m_animation, oldPlayState, newPlayState); |
| 1071 newPlayState); | 1070 } |
| 1072 } | 1071 } |
| 1073 | 1072 |
| 1074 void Animation::addedEventListener( | 1073 void Animation::addedEventListener( |
| 1075 const AtomicString& eventType, | 1074 const AtomicString& eventType, |
| 1076 RegisteredEventListener& registeredListener) { | 1075 RegisteredEventListener& registeredListener) { |
| 1077 EventTargetWithInlineData::addedEventListener(eventType, registeredListener); | 1076 EventTargetWithInlineData::addedEventListener(eventType, registeredListener); |
| 1078 if (eventType == EventTypeNames::finish) | 1077 if (eventType == EventTypeNames::finish) |
| 1079 UseCounter::count(getExecutionContext(), UseCounter::AnimationFinishEvent); | 1078 UseCounter::count(getExecutionContext(), UseCounter::AnimationFinishEvent); |
| 1080 } | 1079 } |
| 1081 | 1080 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1150 DCHECK(!m_compositorPlayer); | 1149 DCHECK(!m_compositorPlayer); |
| 1151 } | 1150 } |
| 1152 | 1151 |
| 1153 void Animation::CompositorAnimationPlayerHolder::detach() { | 1152 void Animation::CompositorAnimationPlayerHolder::detach() { |
| 1154 DCHECK(m_compositorPlayer); | 1153 DCHECK(m_compositorPlayer); |
| 1155 m_compositorPlayer->setAnimationDelegate(nullptr); | 1154 m_compositorPlayer->setAnimationDelegate(nullptr); |
| 1156 m_animation = nullptr; | 1155 m_animation = nullptr; |
| 1157 m_compositorPlayer.reset(); | 1156 m_compositorPlayer.reset(); |
| 1158 } | 1157 } |
| 1159 } // namespace blink | 1158 } // namespace blink |
| OLD | NEW |