| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/events/WebKitAnimationEvent.h" | 27 #include "core/events/AnimationEvent.h" |
| 28 | 28 |
| 29 namespace blink { | 29 namespace blink { |
| 30 | 30 |
| 31 WebKitAnimationEventInit::WebKitAnimationEventInit() | 31 AnimationEventInit::AnimationEventInit() |
| 32 : animationName() | 32 : animationName() |
| 33 , elapsedTime(0.0) | 33 , elapsedTime(0.0) |
| 34 { | 34 { |
| 35 } | 35 } |
| 36 | 36 |
| 37 WebKitAnimationEvent::WebKitAnimationEvent() | 37 AnimationEvent::AnimationEvent() |
| 38 : m_elapsedTime(0.0) | 38 : m_elapsedTime(0.0) |
| 39 { | 39 { |
| 40 ScriptWrappable::init(this); | 40 ScriptWrappable::init(this); |
| 41 } | 41 } |
| 42 | 42 |
| 43 WebKitAnimationEvent::WebKitAnimationEvent(const AtomicString& type, const WebKi
tAnimationEventInit& initializer) | 43 AnimationEvent::AnimationEvent(const AtomicString& type, const AnimationEventIni
t& initializer) |
| 44 : Event(type, initializer) | 44 : Event(type, initializer) |
| 45 , m_animationName(initializer.animationName) | 45 , m_animationName(initializer.animationName) |
| 46 , m_elapsedTime(initializer.elapsedTime) | 46 , m_elapsedTime(initializer.elapsedTime) |
| 47 { | 47 { |
| 48 ScriptWrappable::init(this); | 48 ScriptWrappable::init(this); |
| 49 } | 49 } |
| 50 | 50 |
| 51 WebKitAnimationEvent::WebKitAnimationEvent(const AtomicString& type, const Strin
g& animationName, double elapsedTime) | 51 AnimationEvent::AnimationEvent(const AtomicString& type, const String& animation
Name, double elapsedTime) |
| 52 : Event(type, true, true) | 52 : Event(type, true, true) |
| 53 , m_animationName(animationName) | 53 , m_animationName(animationName) |
| 54 , m_elapsedTime(elapsedTime) | 54 , m_elapsedTime(elapsedTime) |
| 55 { | 55 { |
| 56 ScriptWrappable::init(this); | 56 ScriptWrappable::init(this); |
| 57 } | 57 } |
| 58 | 58 |
| 59 WebKitAnimationEvent::~WebKitAnimationEvent() | 59 AnimationEvent::~AnimationEvent() |
| 60 { | 60 { |
| 61 } | 61 } |
| 62 | 62 |
| 63 const String& WebKitAnimationEvent::animationName() const | 63 const String& AnimationEvent::animationName() const |
| 64 { | 64 { |
| 65 return m_animationName; | 65 return m_animationName; |
| 66 } | 66 } |
| 67 | 67 |
| 68 double WebKitAnimationEvent::elapsedTime() const | 68 double AnimationEvent::elapsedTime() const |
| 69 { | 69 { |
| 70 return m_elapsedTime; | 70 return m_elapsedTime; |
| 71 } | 71 } |
| 72 | 72 |
| 73 const AtomicString& WebKitAnimationEvent::interfaceName() const | 73 const AtomicString& AnimationEvent::interfaceName() const |
| 74 { | 74 { |
| 75 return EventNames::WebKitAnimationEvent; | 75 return EventNames::AnimationEvent; |
| 76 } | 76 } |
| 77 | 77 |
| 78 void WebKitAnimationEvent::trace(Visitor* visitor) | 78 void AnimationEvent::trace(Visitor* visitor) |
| 79 { | 79 { |
| 80 Event::trace(visitor); | 80 Event::trace(visitor); |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace blink | 83 } // namespace blink |
| OLD | NEW |