Move deferred loading logic from WebMediaPlayerClientImpl to HTMLMediaElement.

Source/core/html/HTMLMediaElement.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 307 matching lines @@
 
     virtual void mediaPlayerNetworkStateChanged() OVERRIDE FINAL;
     virtual void mediaPlayerReadyStateChanged() OVERRIDE FINAL;
     virtual void mediaPlayerTimeChanged() OVERRIDE FINAL;
     virtual void mediaPlayerDurationChanged() OVERRIDE FINAL;
     virtual void mediaPlayerPlaybackStateChanged() OVERRIDE FINAL;
     virtual void mediaPlayerRequestFullscreen() OVERRIDE FINAL;
     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;
 
     void loadTimerFired(Timer<HTMLMediaElement>*);
     void progressEventTimerFired(Timer<HTMLMediaElement>*);
     void playbackProgressTimerFired(Timer<HTMLMediaElement>*);
     void startPlaybackProgressTimer();
     void startProgressEventTimer();
     void stopPeriodicTimers();
@@ skipping 65 matching lines @@
 
     void changeNetworkStateFromLoadingToIdle();
 
     const AtomicString& mediaGroup() const;
     void setMediaGroup(const AtomicString&);
     void updateMediaController();
     bool isBlocked() const;
     bool isBlockedOnMediaController() const;
     bool isAutoplaying() const { return m_autoplaying; }
 
+    blink::WebMediaPlayer::CORSMode corsMode() const;
+
+    void setPlayerPreload();
+    void startDelayedLoad();
+    blink::WebMediaPlayer::LoadType loadType() const;
+
     Timer<HTMLMediaElement> m_loadTimer;
     Timer<HTMLMediaElement> m_progressEventTimer;
     Timer<HTMLMediaElement> m_playbackProgressTimer;
     RefPtr<TimeRanges> m_playedTimeRanges;
     OwnPtr<GenericEventQueue> m_asyncEventQueue;
 
     double m_playbackRate;
     double m_defaultPlaybackRate;
     NetworkState m_networkState;
     ReadyState m_readyState;
@@ skipping 72 matching lines @@
     double m_lastTextTrackUpdateTime;
 
     RefPtr<TextTrackList> m_textTracks;
     Vector<RefPtr<TextTrack> > m_textTracksWhenResourceSelectionBegan;
 
     CueIntervalTree m_cueTree;
 
     CueList m_currentlyActiveCues;
     int m_ignoreTrackDisplayUpdate;
 
+    bool m_delayingLoad;

[philipj_slow, 2014/03/08 19:38:40]

Merge this with the bitfield above and it becomes free. A different name to
avoid confusion with the spec's delaying-the-load-event flag would also be
great.

[acolwell GONE FROM CHROMIUM, 2014/03/10 21:53:31]

Done.

+
 #if ENABLE(WEB_AUDIO)
     // This is a weak reference, since m_audioSourceNode holds a reference to us.
     // The value is set just after the MediaElementAudioSourceNode is created.
     // The value is cleared in MediaElementAudioSourceNode::~MediaElementAudioSourceNode().
     MediaElementAudioSourceNode* m_audioSourceNode;
 #endif
 
     friend class MediaController;
     RefPtr<MediaController> m_mediaController;
 
@@ skipping 24 matching lines @@
 inline bool isHTMLMediaElement(const Node& node)
 {
     return node.isElementNode() && toElement(node).isMediaElement();
 }
 
 DEFINE_NODE_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement);
 
 } //namespace
 
 #endif