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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
291 return ActiveDOMObject::executionContext(); | 291 return ActiveDOMObject::executionContext(); |
292 } | 292 } |
293 | 293 |
294 bool AnimationPlayer::hasPendingActivity() const | 294 bool AnimationPlayer::hasPendingActivity() const |
295 { | 295 { |
296 return m_pendingFinishedEvent || (!m_finished && hasEventListeners(EventType
Names::finish)); | 296 return m_pendingFinishedEvent || (!m_finished && hasEventListeners(EventType
Names::finish)); |
297 } | 297 } |
298 | 298 |
299 void AnimationPlayer::stop() | 299 void AnimationPlayer::stop() |
300 { | 300 { |
| 301 m_finished = true; |
301 m_pendingFinishedEvent = nullptr; | 302 m_pendingFinishedEvent = nullptr; |
302 } | 303 } |
303 | 304 |
304 bool AnimationPlayer::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event) | 305 bool AnimationPlayer::dispatchEvent(PassRefPtrWillBeRawPtr<Event> event) |
305 { | 306 { |
306 if (m_pendingFinishedEvent == event) | 307 if (m_pendingFinishedEvent == event) |
307 m_pendingFinishedEvent = nullptr; | 308 m_pendingFinishedEvent = nullptr; |
308 return EventTargetWithInlineData::dispatchEvent(event); | 309 return EventTargetWithInlineData::dispatchEvent(event); |
309 } | 310 } |
310 | 311 |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 | 450 |
450 void AnimationPlayer::trace(Visitor* visitor) | 451 void AnimationPlayer::trace(Visitor* visitor) |
451 { | 452 { |
452 visitor->trace(m_content); | 453 visitor->trace(m_content); |
453 visitor->trace(m_timeline); | 454 visitor->trace(m_timeline); |
454 visitor->trace(m_pendingFinishedEvent); | 455 visitor->trace(m_pendingFinishedEvent); |
455 EventTargetWithInlineData::trace(visitor); | 456 EventTargetWithInlineData::trace(visitor); |
456 } | 457 } |
457 | 458 |
458 } // namespace | 459 } // namespace |
OLD | NEW |