Index: Source/core/html/HTMLMediaElement.h |
diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h |
index 5a1ab2d7f1c2e118bde314d677a5b9d70b2b57a7..17dec4a509f9dda0060dce5f4d9bad7e59bc3c20 100644 |
--- a/Source/core/html/HTMLMediaElement.h |
+++ b/Source/core/html/HTMLMediaElement.h |
@@ -325,9 +325,6 @@ private: |
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; |
@@ -413,6 +410,12 @@ private: |
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; |
@@ -505,6 +508,8 @@ private: |
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
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. |