| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 | 77 |
| 78 virtual bool muted() const OVERRIDE { return m_muted; } | 78 virtual bool muted() const OVERRIDE { return m_muted; } |
| 79 virtual void setMuted(bool) OVERRIDE; | 79 virtual void setMuted(bool) OVERRIDE; |
| 80 | 80 |
| 81 typedef HTMLMediaElement::ReadyState ReadyState; | 81 typedef HTMLMediaElement::ReadyState ReadyState; |
| 82 ReadyState readyState() const { return m_readyState; } | 82 ReadyState readyState() const { return m_readyState; } |
| 83 | 83 |
| 84 enum PlaybackState { WAITING, PLAYING, ENDED }; | 84 enum PlaybackState { WAITING, PLAYING, ENDED }; |
| 85 const AtomicString& playbackState() const; | 85 const AtomicString& playbackState() const; |
| 86 | 86 |
| 87 virtual void enterFullscreen() OVERRIDE { } | |
| 88 | |
| 89 virtual bool hasAudio() const OVERRIDE; | 87 virtual bool hasAudio() const OVERRIDE; |
| 90 virtual bool hasVideo() const OVERRIDE; | |
| 91 | 88 |
| 92 virtual void beginScrubbing() OVERRIDE; | 89 virtual void beginScrubbing() OVERRIDE; |
| 93 virtual void endScrubbing() OVERRIDE; | 90 virtual void endScrubbing() OVERRIDE; |
| 94 | 91 |
| 95 virtual bool canPlay() const OVERRIDE; | 92 virtual bool canPlay() const OVERRIDE; |
| 96 | 93 |
| 97 bool isBlocked() const; | 94 bool isBlocked() const; |
| 98 | 95 |
| 99 void clearExecutionContext() { m_executionContext = 0; } | 96 void clearExecutionContext() { m_executionContext = 0; } |
| 100 | 97 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 mutable Timer<MediaController> m_clearPositionTimer; | 129 mutable Timer<MediaController> m_clearPositionTimer; |
| 133 OwnPtr<Clock> m_clock; | 130 OwnPtr<Clock> m_clock; |
| 134 ExecutionContext* m_executionContext; | 131 ExecutionContext* m_executionContext; |
| 135 Timer<MediaController> m_timeupdateTimer; | 132 Timer<MediaController> m_timeupdateTimer; |
| 136 double m_previousTimeupdateTime; | 133 double m_previousTimeupdateTime; |
| 137 }; | 134 }; |
| 138 | 135 |
| 139 } // namespace WebCore | 136 } // namespace WebCore |
| 140 | 137 |
| 141 #endif | 138 #endif |
| OLD | NEW |