AI 145796: Land the WebKit merge @r42026.

Automated import of CL 145796

1 files changed, 10 insertions, 7 deletions

diff --git a/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h b/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h
index 959147a..e8ba0ad 100644
--- a/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h
+++ b/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h
@@ -33,13 +33,13 @@
 
 #if ENABLE(VIDEO)
 
-#include "MediaPlayer.h"
+#include "MediaPlayerPrivate.h"
 
 namespace WebCore {
 
-class MediaPlayerPrivate : public Noncopyable {
+class MediaPlayerPrivate : public MediaPlayerPrivateInterface {
 public:
-    MediaPlayerPrivate(MediaPlayer*);
+    static void registerMediaEngine(MediaEngineRegistrar);
     ~MediaPlayerPrivate();
 
     IntSize naturalSize() const;
@@ -74,13 +74,10 @@ public:
     unsigned totalBytes() const;
 
     void setVisible(bool);
-    void setRect(const IntRect&);
+    void setSize(const IntSize&);
 
     void paint(GraphicsContext*, const IntRect&);
 
-    static void getSupportedTypes(HashSet<String>&);
-    static bool isAvailable();
-
     // Public methods to be called by WebMediaPlayer
     FrameView* frameView();
     void networkStateChanged();
@@ -90,6 +87,12 @@ public:
     void repaint();
 
 private:
+    MediaPlayerPrivate(MediaPlayer*);
+    static MediaPlayerPrivateInterface* create(MediaPlayer* player);
+    static void getSupportedTypes(HashSet<String>&);
+    static MediaPlayer::SupportsType supportsType(const String& type, const String& codecs);
+    static bool isAvailable();
+
     MediaPlayer* m_player;
     void* m_data;
 };