Revert 169465 "Move deferred loading logic from WebMediaPlayerCl..."

trunk/Source/web/WebMediaPlayerClientImpl.h

Index: trunk/Source/web/WebMediaPlayerClientImpl.h
===================================================================
--- trunk/Source/web/WebMediaPlayerClientImpl.h	(revision 169469)
+++ trunk/Source/web/WebMediaPlayerClientImpl.h	(working copy)
@@ -95,9 +95,10 @@
 
     // MediaPlayer methods:
     virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
-    virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
+    virtual void load(WebMediaPlayer::LoadType, const WTF::String& url) OVERRIDE;
     virtual void play() OVERRIDE;
     virtual void pause() OVERRIDE;
+    virtual void prepareToPlay() OVERRIDE;
     virtual bool supportsSave() const OVERRIDE;
     virtual WebCore::IntSize naturalSize() const OVERRIDE;
     virtual bool hasVideo() const OVERRIDE;
@@ -137,6 +138,9 @@
 private:
     explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
 
+    void startDelayedLoad();
+    void loadInternal();
+
     WebCore::HTMLMediaElement& mediaElement() const;
 
 #if OS(ANDROID)
@@ -149,6 +153,8 @@
 
     WebCore::MediaPlayerClient* m_client;
     OwnPtr<WebMediaPlayer> m_webMediaPlayer;
+    WebCore::KURL m_url;
+    bool m_delayingLoad;
     WebCore::MediaPlayer::Preload m_preload;
     bool m_needsWebLayerForVideo;
     double m_rate;
@@ -200,6 +206,8 @@
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
+
+    WebMediaPlayer::LoadType m_loadType;
 };
 
 } // namespace blink