diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit/chromium/public/WebMediaPlayerClient.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit/chromium/public/WebMediaPlayerClient.h')
| -rw-r--r-- | Source/WebKit/chromium/public/WebMediaPlayerClient.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/public/WebMediaPlayerClient.h b/Source/WebKit/chromium/public/WebMediaPlayerClient.h index 5f60870..6919717 100644 --- a/Source/WebKit/chromium/public/WebMediaPlayerClient.h +++ b/Source/WebKit/chromium/public/WebMediaPlayerClient.h @@ -31,6 +31,8 @@ #ifndef WebMediaPlayerClient_h #define WebMediaPlayerClient_h +#include "WebMediaPlayer.h" + namespace WebKit { class WebRequest; @@ -50,6 +52,7 @@ public: virtual void sawUnsupportedTracks() = 0; virtual float volume() const = 0; virtual void playbackStateChanged() = 0; + virtual WebMediaPlayer::Preload preload() const = 0; protected: ~WebMediaPlayerClient() { } |