Merge in WebKit r47029.

1 files changed, 20 insertions, 1 deletions

diff --git a/WebCore/platform/graphics/MediaPlayerPrivate.h b/WebCore/platform/graphics/MediaPlayerPrivate.h
index e17259c..6d1359b 100644
--- a/WebCore/platform/graphics/MediaPlayerPrivate.h
+++ b/WebCore/platform/graphics/MediaPlayerPrivate.h
@@ -46,6 +46,9 @@ public:
     virtual void play() = 0;
     virtual void pause() = 0;    
 
+    virtual bool supportsFullscreen() const { return false; }
+    virtual bool supportsSave() const { return false; }
+
     virtual IntSize naturalSize() const = 0;
 
     virtual bool hasVideo() const = 0;
@@ -63,6 +66,8 @@ public:
     virtual void setEndTime(float) = 0;
 
     virtual void setRate(float) = 0;
+    virtual void setPreservesPitch(bool) { }
+
     virtual bool paused() const = 0;
 
     virtual void setVolume(float) = 0;
@@ -81,7 +86,9 @@ public:
 
     virtual void setSize(const IntSize&) = 0;
 
-    virtual void paint(GraphicsContext*, const IntRect&) = 0 ;
+    virtual void paint(GraphicsContext*, const IntRect&) = 0;
+
+    virtual void paintCurrentFrameInContext(GraphicsContext* c, const IntRect& r) { paint(c, r); }
 
     virtual void setAutobuffer(bool) { };
 
@@ -90,6 +97,18 @@ public:
     virtual void deliverNotification(MediaPlayerProxyNotificationType) = 0;
     virtual void setMediaPlayerProxy(WebMediaPlayerProxy*) = 0;
 #endif
+
+#if USE(ACCELERATED_COMPOSITING)
+    // whether accelerated rendering is supported by the media engine for the current media.
+    virtual bool supportsAcceleratedRendering() const { return false; }
+    // called when the rendering system flips the into or out of accelerated rendering mode.
+    virtual void acceleratedRenderingStateChanged() { }
+#endif
+
+    virtual bool hasSingleSecurityOrigin() const { return false; }
+
+    virtual MediaPlayer::MovieLoadType movieLoadType() const { return MediaPlayer::Unknown; }
+
 };
 
 }