OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "core/inspector/InspectorAnimationAgent.h" | 7 #include "core/inspector/InspectorAnimationAgent.h" |
8 | 8 |
9 #include "core/animation/Animation.h" | 9 #include "core/animation/Animation.h" |
10 #include "core/animation/AnimationEffect.h" | 10 #include "core/animation/AnimationEffect.h" |
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 return base64Encode(reinterpret_cast<const char*>(digestResult.data()), 10); | 416 return base64Encode(reinterpret_cast<const char*>(digestResult.data()), 10); |
417 } | 417 } |
418 | 418 |
419 void InspectorAnimationAgent::didCreateAnimation(unsigned sequenceNumber) | 419 void InspectorAnimationAgent::didCreateAnimation(unsigned sequenceNumber) |
420 { | 420 { |
421 if (m_isCloning) | 421 if (m_isCloning) |
422 return; | 422 return; |
423 frontend()->animationCreated(String::number(sequenceNumber)); | 423 frontend()->animationCreated(String::number(sequenceNumber)); |
424 } | 424 } |
425 | 425 |
426 void InspectorAnimationAgent::didCancelAnimation(unsigned sequenceNumber) | 426 void InspectorAnimationAgent::animationPlayStateChanged(Animation* animation, An
imation::AnimationPlayState oldPlayState, Animation::AnimationPlayState newPlayS
tate) |
427 { | |
428 frontend()->animationCanceled(String::number(sequenceNumber)); | |
429 } | |
430 | |
431 void InspectorAnimationAgent::didStartAnimation(Animation* animation) | |
432 { | 427 { |
433 const String& animationId = String::number(animation->sequenceNumber()); | 428 const String& animationId = String::number(animation->sequenceNumber()); |
434 if (m_idToAnimation.get(animationId)) | 429 if (m_idToAnimation.get(animationId)) |
435 return; | 430 return; |
436 frontend()->animationStarted(buildObjectForAnimation(*animation)); | 431 if (newPlayState == Animation::Running || newPlayState == Animation::Finishe
d) |
| 432 frontend()->animationStarted(buildObjectForAnimation(*animation)); |
| 433 else if (newPlayState == Animation::Idle || newPlayState == Animation::Pause
d) |
| 434 frontend()->animationCanceled(animationId); |
437 } | 435 } |
438 | 436 |
439 void InspectorAnimationAgent::didClearDocumentOfWindowObject(LocalFrame* frame) | 437 void InspectorAnimationAgent::didClearDocumentOfWindowObject(LocalFrame* frame) |
440 { | 438 { |
441 if (!m_state->getBoolean(AnimationAgentState::animationAgentEnabled)) | 439 if (!m_state->getBoolean(AnimationAgentState::animationAgentEnabled)) |
442 return; | 440 return; |
443 ASSERT(frame->document()); | 441 ASSERT(frame->document()); |
444 frame->document()->timeline().setPlaybackRate(referenceTimeline().playbackRa
te()); | 442 frame->document()->timeline().setPlaybackRate(referenceTimeline().playbackRa
te()); |
445 } | 443 } |
446 | 444 |
(...skipping 26 matching lines...) Expand all Loading... |
473 visitor->trace(m_cssAgent); | 471 visitor->trace(m_cssAgent); |
474 visitor->trace(m_injectedScriptManager); | 472 visitor->trace(m_injectedScriptManager); |
475 visitor->trace(m_idToAnimation); | 473 visitor->trace(m_idToAnimation); |
476 visitor->trace(m_idToAnimationType); | 474 visitor->trace(m_idToAnimationType); |
477 visitor->trace(m_idToAnimationClone); | 475 visitor->trace(m_idToAnimationClone); |
478 #endif | 476 #endif |
479 InspectorBaseAgent::trace(visitor); | 477 InspectorBaseAgent::trace(visitor); |
480 } | 478 } |
481 | 479 |
482 } | 480 } |
OLD | NEW |