diff options
| author | Andrei Popescu <andreip@google.com> | 2009-10-06 14:44:10 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-14 16:53:30 +0100 |
| commit | 7da6c11f9b0356ea2b070f6114d2005cbc2c43bb (patch) | |
| tree | 6c8649623c4c1fcbd9bc4db0ced1887e498bdeb7 /WebCore/platform/graphics/MediaPlayerPrivate.h | |
| parent | 25323377ad937254493c5d3d3454a655e508fcec (diff) | |
| download | external_webkit-7da6c11f9b0356ea2b070f6114d2005cbc2c43bb.zip external_webkit-7da6c11f9b0356ea2b070f6114d2005cbc2c43bb.tar.gz external_webkit-7da6c11f9b0356ea2b070f6114d2005cbc2c43bb.tar.bz2 | |
Remove the Android guards added to the <video> implementation in WebCore. Do not merge.
The patch in https://bugs.webkit.org/show_bug.cgi?id=29133 landed.
This has already been submitted to master branch.
Diffstat (limited to 'WebCore/platform/graphics/MediaPlayerPrivate.h')
| -rw-r--r-- | WebCore/platform/graphics/MediaPlayerPrivate.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/MediaPlayerPrivate.h b/WebCore/platform/graphics/MediaPlayerPrivate.h index 109ad10..de7f75c 100644 --- a/WebCore/platform/graphics/MediaPlayerPrivate.h +++ b/WebCore/platform/graphics/MediaPlayerPrivate.h @@ -43,6 +43,7 @@ public: virtual void load(const String& url) = 0; virtual void cancelLoad() = 0; + virtual void prepareToPlay() { } virtual void play() = 0; virtual void pause() = 0; @@ -92,14 +93,10 @@ public: virtual void setAutobuffer(bool) { }; -#if PLATFORM(ANDROID) virtual bool canLoadPoster() const { return false; } virtual void setPoster(const String&) { } - virtual void prepareToPlay() { } -#endif #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) - virtual void setPoster(const String& url) = 0; virtual void deliverNotification(MediaPlayerProxyNotificationType) = 0; virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) = 0; #endif |