From 2471bb64fd133cc64b2048b1fb90c84e08c24a16 Mon Sep 17 00:00:00 2001
From: Andrei Popescu <andreip@google.com>
Date: Tue, 15 Sep 2009 13:09:27 +0100
Subject: Add poster support and other fixes

---
 WebCore/platform/graphics/MediaPlayer.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'WebCore/platform/graphics/MediaPlayer.cpp')

diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 6205a7b..15815dc 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -104,6 +104,11 @@ public:
 
     virtual void paint(GraphicsContext*, const IntRect&) { }
 
+#if PLATFORM(ANDROID)
+    virtual bool canLoadPoster() const { return false; }
+    virtual void setPoster(const String&) { }
+#endif
+
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
     virtual void setPoster(const String& /*url*/) { }
     virtual void deliverNotification(MediaPlayerProxyNotificationType) { }
@@ -253,11 +258,18 @@ void MediaPlayer::load(const String& url, const ContentType& contentType)
         m_private.set(createNullMediaPlayer(this));
 }    
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+#if PLATFORM(ANDROID)
+bool MediaPlayer::canLoadPoster() const
+{
+    return m_private->canLoadPoster();
+}
+#endif
+
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) || PLATFORM(ANDROID)
 void MediaPlayer::setPoster(const String& url)
 {
     m_private->setPoster(url);
-}    
+}
 #endif
 
 void MediaPlayer::cancelLoad()
-- 
cgit v1.1