1 files changed, 12 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/MediaPlayer.h b/WebCore/platform/graphics/MediaPlayer.h
index a9499a5..6525ca6 100644
--- a/WebCore/platform/graphics/MediaPlayer.h
+++ b/WebCore/platform/graphics/MediaPlayer.h
@@ -91,6 +91,7 @@ class GraphicsContext;
 class IntRect;
 class IntSize;
 class MediaPlayer;
+struct MediaPlayerFactory;
 class TimeRanges;
 
 class MediaPlayerClient {
@@ -136,6 +137,8 @@ public:
     // the movie size has changed
     virtual void mediaPlayerSizeChanged(MediaPlayer*) { }
 
+    virtual void mediaPlayerEngineUpdated(MediaPlayer*) { }
+
 #if USE(ACCELERATED_COMPOSITING)
     // whether the rendering system can accelerate the display of this MediaPlayer.
     virtual bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*) { return false; }
@@ -157,7 +160,7 @@ public:
 
     // media engine support
     enum SupportsType { IsNotSupported, IsSupported, MayBeSupported };
-    static MediaPlayer::SupportsType supportsType(ContentType contentType);
+    static MediaPlayer::SupportsType supportsType(const ContentType&);
     static void getSupportedTypes(HashSet<String>&);
     static bool isAvailable();
 
@@ -184,7 +187,7 @@ public:
     IntSize size() const { return m_size; }
     void setSize(const IntSize& size);
     
-    void load(const String& url, const ContentType& contentType);
+    void load(const String& url, const ContentType&);
     void cancelLoad();
     
     bool visible() const;
@@ -285,12 +288,18 @@ public:
 
 private:
     MediaPlayer(MediaPlayerClient*);
+    void loadWithNextMediaEngine(MediaPlayerFactory*);
+    void reloadTimerFired(Timer<MediaPlayer>*);
 
     static void initializeMediaEngines();
 
     MediaPlayerClient* m_mediaPlayerClient;
+    Timer<MediaPlayer> m_reloadTimer;
     OwnPtr<MediaPlayerPrivateInterface*> m_private;
-    void* m_currentMediaEngine;
+    MediaPlayerFactory* m_currentMediaEngine;
+    String m_url;
+    String m_contentMIMEType;
+    String m_contentTypeCodecs;
     FrameView* m_frameView;
     IntSize m_size;
     Preload m_preload;