| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 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 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 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 #ifndef MediaController_h | 26 #ifndef MediaController_h |
| 27 #define MediaController_h | 27 #define MediaController_h |
| 28 | 28 |
| 29 #include "bindings/v8/ScriptWrappable.h" | 29 #include "bindings/v8/ScriptWrappable.h" |
| 30 #include "core/events/Event.h" | 30 #include "core/events/Event.h" |
| 31 #include "core/events/EventTarget.h" | 31 #include "core/events/EventTarget.h" |
| 32 #include "core/html/HTMLMediaElement.h" |
| 32 #include "core/html/MediaControllerInterface.h" | 33 #include "core/html/MediaControllerInterface.h" |
| 33 #include "platform/Timer.h" | 34 #include "platform/Timer.h" |
| 34 #include "wtf/PassRefPtr.h" | 35 #include "wtf/PassRefPtr.h" |
| 35 #include "wtf/RefCounted.h" | 36 #include "wtf/RefCounted.h" |
| 36 #include "wtf/Vector.h" | 37 #include "wtf/Vector.h" |
| 37 | 38 |
| 38 namespace WebCore { | 39 namespace WebCore { |
| 39 | 40 |
| 40 class Clock; | 41 class Clock; |
| 41 class Event; | 42 class Event; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 | 74 |
| 74 virtual double playbackRate() const OVERRIDE; | 75 virtual double playbackRate() const OVERRIDE; |
| 75 virtual void setPlaybackRate(double) OVERRIDE; | 76 virtual void setPlaybackRate(double) OVERRIDE; |
| 76 | 77 |
| 77 virtual double volume() const OVERRIDE { return m_volume; } | 78 virtual double volume() const OVERRIDE { return m_volume; } |
| 78 virtual void setVolume(double, ExceptionState&) OVERRIDE; | 79 virtual void setVolume(double, ExceptionState&) OVERRIDE; |
| 79 | 80 |
| 80 virtual bool muted() const OVERRIDE { return m_muted; } | 81 virtual bool muted() const OVERRIDE { return m_muted; } |
| 81 virtual void setMuted(bool) OVERRIDE; | 82 virtual void setMuted(bool) OVERRIDE; |
| 82 | 83 |
| 83 virtual ReadyState readyState() const OVERRIDE { return m_readyState; } | 84 typedef HTMLMediaElement::ReadyState ReadyState; |
| 85 ReadyState readyState() const { return m_readyState; } |
| 84 | 86 |
| 85 enum PlaybackState { WAITING, PLAYING, ENDED }; | 87 enum PlaybackState { WAITING, PLAYING, ENDED }; |
| 86 const AtomicString& playbackState() const; | 88 const AtomicString& playbackState() const; |
| 87 | 89 |
| 88 virtual bool isFullscreen() const OVERRIDE { return false; } | 90 virtual bool isFullscreen() const OVERRIDE { return false; } |
| 89 virtual void enterFullscreen() OVERRIDE { } | 91 virtual void enterFullscreen() OVERRIDE { } |
| 90 | 92 |
| 91 virtual bool hasAudio() const OVERRIDE; | 93 virtual bool hasAudio() const OVERRIDE; |
| 92 virtual bool hasVideo() const OVERRIDE; | 94 virtual bool hasVideo() const OVERRIDE; |
| 93 virtual bool hasClosedCaptions() const OVERRIDE; | 95 virtual bool hasClosedCaptions() const OVERRIDE; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 bool m_closedCaptionsVisible; | 143 bool m_closedCaptionsVisible; |
| 142 OwnPtr<Clock> m_clock; | 144 OwnPtr<Clock> m_clock; |
| 143 ExecutionContext* m_executionContext; | 145 ExecutionContext* m_executionContext; |
| 144 Timer<MediaController> m_timeupdateTimer; | 146 Timer<MediaController> m_timeupdateTimer; |
| 145 double m_previousTimeupdateTime; | 147 double m_previousTimeupdateTime; |
| 146 }; | 148 }; |
| 147 | 149 |
| 148 } // namespace WebCore | 150 } // namespace WebCore |
| 149 | 151 |
| 150 #endif | 152 #endif |
| OLD | NEW |