| Index: Source/core/html/MediaController.h
|
| diff --git a/Source/core/html/MediaController.h b/Source/core/html/MediaController.h
|
| index 9479d250e145e44ce75feacc6cb3fbdf40a7c423..7a10640be37e40f0822f0328a27b186061ccbc3b 100644
|
| --- a/Source/core/html/MediaController.h
|
| +++ b/Source/core/html/MediaController.h
|
| @@ -56,9 +56,9 @@ public:
|
|
|
| const String& mediaGroup() const { return m_mediaGroup; }
|
|
|
| - virtual PassRefPtr<TimeRanges> buffered() const OVERRIDE;
|
| - virtual PassRefPtr<TimeRanges> seekable() const OVERRIDE;
|
| - virtual PassRefPtr<TimeRanges> played() OVERRIDE;
|
| + PassRefPtr<TimeRanges> buffered() const;
|
| + PassRefPtr<TimeRanges> seekable() const;
|
| + PassRefPtr<TimeRanges> played();
|
|
|
| virtual double duration() const OVERRIDE;
|
| virtual double currentTime() const OVERRIDE;
|
| @@ -69,11 +69,11 @@ public:
|
| virtual void pause() OVERRIDE;
|
| void unpause();
|
|
|
| - virtual double defaultPlaybackRate() const OVERRIDE { return m_defaultPlaybackRate; }
|
| - virtual void setDefaultPlaybackRate(double) OVERRIDE;
|
| + double defaultPlaybackRate() const { return m_defaultPlaybackRate; }
|
| + void setDefaultPlaybackRate(double);
|
|
|
| - virtual double playbackRate() const OVERRIDE;
|
| - virtual void setPlaybackRate(double) OVERRIDE;
|
| + double playbackRate() const;
|
| + void setPlaybackRate(double);
|
|
|
| virtual double volume() const OVERRIDE { return m_volume; }
|
| virtual void setVolume(double, ExceptionState&) OVERRIDE;
|
| @@ -86,7 +86,6 @@ public:
|
| enum PlaybackState { WAITING, PLAYING, ENDED };
|
| const AtomicString& playbackState() const;
|
|
|
| - virtual bool isFullscreen() const OVERRIDE { return false; }
|
| virtual void enterFullscreen() OVERRIDE { }
|
|
|
| virtual bool hasAudio() const OVERRIDE;
|
| @@ -100,8 +99,6 @@ public:
|
|
|
| virtual bool canPlay() const OVERRIDE;
|
|
|
| - virtual bool hasCurrentSrc() const OVERRIDE;
|
| -
|
| bool isBlocked() const;
|
|
|
| void clearExecutionContext() { m_executionContext = 0; }
|
|
|