third_party/WebKit/Source/core/loader/EmptyClients.h - Issue 1825763002: media: Enable Unified Media Pipeline for MSE and EME on Android

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/loader/EmptyClients.h

Issue 1825763002: media: Enable Unified Media Pipeline for MSE and EME on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix 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

« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLVideoElementTest.cpp ('k') | third_party/WebKit/Source/core/loader/EmptyClients.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/EmptyClients.h

diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h

index d43bcd269e786f36206e9f22babcb3ecd7701bc4..eed3a0f2269597603f26504f05dc23d25ee8d7ae 100644

--- a/third_party/WebKit/Source/core/loader/EmptyClients.h

+++ b/third_party/WebKit/Source/core/loader/EmptyClients.h

@@ -47,7 +47,6 @@

#include "platform/text/TextCheckerClient.h"

#include "public/platform/WebFocusType.h"

#include "public/platform/WebFrameScheduler.h"

-#include "public/platform/WebMediaPlayer.h"

#include "public/platform/WebScreenInfo.h"

#include "wtf/Forward.h"

#include <v8.h>

@@ -247,7 +246,7 @@ public:

PassRefPtrWillBeRawPtr<LocalFrame> createFrame(const FrameLoadRequest&, const AtomicString&, HTMLFrameOwnerElement*) override;

PassRefPtrWillBeRawPtr<Widget> createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPluginPolicy) override;

bool canCreatePluginWithoutRenderer(const String& mimeType) const override { return false; }

- PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, WebMediaPlayer::LoadType, const WebURL&, WebMediaPlayerClient*) override;

+ PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebURL&, WebMediaPlayerClient*) override;

PassOwnPtr<WebMediaSession> createWebMediaSession() override;

ObjectContentType getObjectContentType(const KURL&, const String&, bool) override { return ObjectContentType(); }