Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(986)

Unified Diff: third_party/WebKit/Source/core/html/HTMLMediaElement.h

Issue 1522463003: Refactor resource load and resource selection algorithms as per spec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed prepareToPlay and refactored code in call sites Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index d922e17663329c83ae765be9562ac9d3e29f053c..a21134dd83f13fa6c05e56b46e41725367c0d322 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -97,7 +97,7 @@ public:
LoadMediaResource = 1 << 0,
LoadTextTrackResource = 1 << 1
};
- void scheduleDelayedAction(DelayedActionType);
+ void scheduleTextTrackResourceLoad();
bool hasRemoteRoutes() const { return m_remoteRoutesAvailable; }
bool isPlayingRemotely() const { return m_playingRemotely; }
@@ -345,7 +345,9 @@ private:
void scheduleEvent(const AtomicString& eventName); // FIXME: Rename to scheduleNamedEvent for clarity.
// loading
+ void invokeLoadAlgorithm();
void prepareForLoad();
+ void invokeResourceSelectionAlgorithm();
void loadInternal();
void selectMediaResource();
void loadResource(const KURL&, ContentType&);
@@ -361,7 +363,6 @@ private:
void mediaEngineError(MediaError*);
void cancelPendingEventsAndCallbacks();
void waitForSourceChange();
- void prepareToPlay();
KURL selectNextSourceChild(ContentType*, InvalidURLAction);
@@ -552,8 +553,7 @@ private:
bool m_closedCaptionsVisible : 1;
- bool m_havePreparedToPlay : 1;
-
+ bool m_ignorePreloadNone : 1;
philipj_slow 2016/03/09 09:16:00 m_forceEffectivePreloadAuto might be a more descri
Srirama 2016/03/09 12:26:22 Done.
bool m_tracksAreReady : 1;
bool m_processingPreferenceChange : 1;
bool m_remoteRoutesAvailable : 1;

Powered by Google App Engine
This is Rietveld 408576698