webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 16 deletions

diff --git a/Source/WebCore/html/MediaControllerInterface.h b/Source/WebCore/html/MediaControllerInterface.h
index afbde0aa3..d5347414c 100644
--- a/Source/WebCore/html/MediaControllerInterface.h
+++ b/Source/WebCore/html/MediaControllerInterface.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,27 +23,25 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef MediaControllerInterface_h
-#define MediaControllerInterface_h
+#pragma once
 
 #if ENABLE(VIDEO)
 
-#include <wtf/PassRefPtr.h>
+#include "ExceptionOr.h"
+#include "HTMLMediaElementEnums.h"
 
 namespace WebCore {
 
 class TimeRanges;
 
-typedef int ExceptionCode;
-
-class MediaControllerInterface {
+class MediaControllerInterface : public HTMLMediaElementEnums {
 public:
     virtual ~MediaControllerInterface() { };
     
     // MediaController IDL:
-    virtual PassRefPtr<TimeRanges> buffered() const = 0;
-    virtual PassRefPtr<TimeRanges> seekable() const = 0;
-    virtual PassRefPtr<TimeRanges> played() = 0;
+    virtual Ref<TimeRanges> buffered() const = 0;
+    virtual Ref<TimeRanges> seekable() const = 0;
+    virtual Ref<TimeRanges> played() = 0;
     
     virtual double duration() const = 0;
     virtual double currentTime() const = 0;
@@ -60,16 +58,16 @@ public:
     virtual void setPlaybackRate(double) = 0;
     
     virtual double volume() const = 0;
-    virtual void setVolume(double, ExceptionCode&) = 0;
+    virtual ExceptionOr<void> setVolume(double) = 0;
     
     virtual bool muted() const = 0;
     virtual void setMuted(bool) = 0;
-    
-    enum ReadyState { HAVE_NOTHING, HAVE_METADATA, HAVE_CURRENT_DATA, HAVE_FUTURE_DATA, HAVE_ENOUGH_DATA };
+
+    using HTMLMediaElementEnums::ReadyState;
     virtual ReadyState readyState() const = 0;
 
     // MediaControlElements:
-    virtual bool supportsFullscreen() const = 0;
+    virtual bool supportsFullscreen(HTMLMediaElementEnums::VideoFullscreenMode) const = 0;
     virtual bool isFullscreen() const = 0;
     virtual void enterFullscreen() = 0;
 
@@ -84,6 +82,10 @@ public:
     virtual void beginScrubbing() = 0;
     virtual void endScrubbing() = 0;
 
+    enum ScanDirection { Backward, Forward };
+    virtual void beginScanning(ScanDirection) = 0;
+    virtual void endScanning() = 0;
+
     virtual bool canPlay() const = 0;
 
     virtual bool isLiveStream() const = 0;
@@ -96,4 +98,3 @@ public:
 }
 
 #endif
-#endif