Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / MediaController.h

diff --git a/src/third_party/WebKit/Source/core/html/MediaController.h b/src/third_party/WebKit/Source/core/html/MediaController.h
index 196d419..deee58c 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/MediaController.h
+++ b/src/third_party/WebKit/Source/core/html/MediaController.h
@@ -29,6 +29,7 @@
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/events/Event.h"
 #include "core/events/EventTarget.h"
+#include "core/html/HTMLMediaElement.h"
 #include "core/html/MediaControllerInterface.h"
 #include "platform/Timer.h"
 #include "wtf/PassRefPtr.h"
@@ -53,11 +54,9 @@ public:
     void removeMediaElement(HTMLMediaElement*);
     bool containsMediaElement(HTMLMediaElement*) const;
 
-    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;
@@ -68,11 +67,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;
@@ -80,12 +79,12 @@ public:
     virtual bool muted() const OVERRIDE { return m_muted; }
     virtual void setMuted(bool) OVERRIDE;
 
-    virtual ReadyState readyState() const OVERRIDE { return m_readyState; }
+    typedef HTMLMediaElement::ReadyState ReadyState;
+    ReadyState readyState() const { return m_readyState; }
 
     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;
@@ -99,8 +98,6 @@ public:
 
     virtual bool canPlay() const OVERRIDE;
 
-    virtual bool hasCurrentSrc() const OVERRIDE;
-
     bool isBlocked() const;
 
     void clearExecutionContext() { m_executionContext = 0; }
@@ -137,7 +134,6 @@ private:
     Vector<RefPtr<Event> > m_pendingEvents;
     Timer<MediaController> m_asyncEventTimer;
     mutable Timer<MediaController> m_clearPositionTimer;
-    String m_mediaGroup;
     bool m_closedCaptionsVisible;
     OwnPtr<Clock> m_clock;
     ExecutionContext* m_executionContext;