third_party/WebKit/Source/core/html/HTMLMediaElement.h - Issue 2095053003: Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2095053003: Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743

Patch Set: Created 4 years, 6 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 7166e16b7b77219112ef637d722341500351034d..9891e9bd935d7d7b19bb6df1ae5771dbdfc70dca 100644

--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h

+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h

@@ -347,6 +347,7 @@ private:

void connectedToRemoteDevice() final;

void disconnectedFromRemoteDevice() final;

void cancelledRemotePlaybackRequest() final;

+ void requestReload(const WebURL&) final;

void loadTimerFired(Timer<HTMLMediaElement>*);

void progressEventTimerFired(Timer<HTMLMediaElement>*);

@@ -367,8 +368,8 @@ private:

void invokeResourceSelectionAlgorithm();

void loadInternal();

void selectMediaResource();

- void loadResource(const WebMediaPlayerSource&, ContentType&);

- void startPlayerLoad();

+ void loadResource(const WebMediaPlayerSource&, const ContentType&);

+ void startPlayerLoad(const KURL& playerProvidedUrl = KURL());

void setPlayerPreload();

WebMediaPlayer::LoadType loadType() const;

void scheduleNextSourceChild();

« no previous file with comments | « media/test/data/bear0.ts ('k') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('j') | no next file with comments »