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

trunk/Source/core/html/HTMLMediaElement.h

Index: trunk/Source/core/html/HTMLMediaElement.h
===================================================================
--- trunk/Source/core/html/HTMLMediaElement.h	(revision 169469)
+++ trunk/Source/core/html/HTMLMediaElement.h	(working copy)
@@ -326,6 +326,9 @@
     virtual void mediaPlayerRequestSeek(double) OVERRIDE FINAL;
     virtual void mediaPlayerRepaint() OVERRIDE FINAL;
     virtual void mediaPlayerSizeChanged() OVERRIDE FINAL;
+
+    virtual CORSMode mediaPlayerCORSMode() const OVERRIDE FINAL;
+
     virtual void mediaPlayerSetWebLayer(blink::WebLayer*) OVERRIDE FINAL;
     virtual void mediaPlayerSetOpaque(bool) OVERRIDE FINAL;
     virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) OVERRIDE FINAL;
@@ -350,9 +353,6 @@
     void loadInternal();
     void selectMediaResource();
     void loadResource(const KURL&, ContentType&, const String& keySystem);
-    void setPlayerPreload();
-    void startDelayedLoad();
-    blink::WebMediaPlayer::LoadType loadType() const;
     void scheduleNextSourceChild();
     void loadNextSourceChild();
     void userCancelledLoad();
@@ -414,8 +414,6 @@
     bool isBlockedOnMediaController() const;
     bool isAutoplaying() const { return m_autoplaying; }
 
-    blink::WebMediaPlayer::CORSMode corsMode() const;
-
     Timer<HTMLMediaElement> m_loadTimer;
     Timer<HTMLMediaElement> m_progressEventTimer;
     Timer<HTMLMediaElement> m_playbackProgressTimer;
@@ -494,7 +492,6 @@
 
     bool m_completelyLoaded : 1;
     bool m_havePreparedToPlay : 1;
-    bool m_delayingLoadForPreloadNone : 1;
 
     bool m_tracksAreReady : 1;
     bool m_haveVisibleTextTrack : 1;