Merge WebKit at r84325: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebKit / chromium / public / WebMediaPlayer.h

diff --git a/Source/WebKit/chromium/public/WebMediaPlayer.h b/Source/WebKit/chromium/public/WebMediaPlayer.h
index 6cec0f5..3b2aaaa 100644 (file)
--- a/Source/WebKit/chromium/public/WebMediaPlayer.h
+++ b/Source/WebKit/chromium/public/WebMediaPlayer.h
@@ -79,6 +79,12 @@ public:
         LiveStream,
     };
 
         LiveStream,
     };
 

+    enum Preload {
+        None,
+        MetaData,
+        Auto,
+    };
+

     virtual ~WebMediaPlayer() {}
 
     virtual void load(const WebURL&) = 0;
     virtual ~WebMediaPlayer() {}
 
     virtual void load(const WebURL&) = 0;


@@ -94,7 +100,7 @@ public:
     virtual void setRate(float) = 0;
     virtual void setVolume(float) = 0;
     virtual void setVisible(bool) = 0;
     virtual void setRate(float) = 0;
     virtual void setVolume(float) = 0;
     virtual void setVisible(bool) = 0;

-    virtual bool setAutoBuffer(bool) = 0;
+    virtual void setPreload(Preload) { };

     virtual bool totalBytesKnown() = 0;
     virtual const WebTimeRanges& buffered() = 0;
     virtual float maxTimeSeekable() const = 0;
     virtual bool totalBytesKnown() = 0;
     virtual const WebTimeRanges& buffered() = 0;
     virtual float maxTimeSeekable() const = 0;


@@ -129,6 +135,11 @@ public:
     virtual bool hasSingleSecurityOrigin() const = 0;
     virtual MovieLoadType movieLoadType() const = 0;
 
     virtual bool hasSingleSecurityOrigin() const = 0;
     virtual MovieLoadType movieLoadType() const = 0;
 

+    virtual unsigned decodedFrameCount() const = 0;
+    virtual unsigned droppedFrameCount() const = 0;
+    virtual unsigned audioDecodedByteCount() const = 0;
+    virtual unsigned videoDecodedByteCount() const = 0;
+

     // This function returns a pointer to a WebVideoFrame, which is
     // a WebKit wrapper for a video frame in chromium. This places a lock
     // on the frame in chromium, and calls to this method should always be
     // This function returns a pointer to a WebVideoFrame, which is
     // a WebKit wrapper for a video frame in chromium. This places a lock
     // on the frame in chromium, and calls to this method should always be