| Index: Source/core/html/HTMLMediaElement.h
|
| diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h
|
| index df5b8bf3d60998cc3f4f5c2b9b1b59d874a860c5..ec8a1d081d7edef1286e83278894c8302e97ac50 100644
|
| --- a/Source/core/html/HTMLMediaElement.h
|
| +++ b/Source/core/html/HTMLMediaElement.h
|
| @@ -326,9 +326,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;
|
| @@ -353,6 +350,9 @@ private:
|
| 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,6 +414,8 @@ private:
|
| 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;
|
| @@ -492,6 +494,7 @@ private:
|
|
|
| bool m_completelyLoaded : 1;
|
| bool m_havePreparedToPlay : 1;
|
| + bool m_delayingLoadForPreloadNone : 1;
|
|
|
| bool m_tracksAreReady : 1;
|
| bool m_haveVisibleTextTrack : 1;
|
|
|