diff options
| author | dfalcantara <dfalcantara@chromium.org> | 2016-03-25 16:45:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 23:46:59 +0000 |
| commit | e0eeb14423a840cfaec05a0218897c3bf35a4548 (patch) | |
| tree | 91a48d6a5354b0b4519eb53fb70f4482d5d4bd2b /third_party/WebKit/Source/core/loader/EmptyClients.h | |
| parent | d1c68aa675d8d5586e2cda7df1ad56d5e4129e59 (diff) | |
| download | chromium_src-e0eeb14423a840cfaec05a0218897c3bf35a4548.zip chromium_src-e0eeb14423a840cfaec05a0218897c3bf35a4548.tar.gz chromium_src-e0eeb14423a840cfaec05a0218897c3bf35a4548.tar.bz2 | |
Revert of media: Enable Unified Media Pipeline for MSE and EME on Android (patchset #3 id:40001 of https://chromiumcodereview.appspot.com/1825763002/ )
Reason for revert:
Android tests on many bots started failing right after this; these are the most obvious:
https://build.chromium.org/p/chromium.android/builders/Lollipop%20Phone%20Tester/builds/3714
* RenderFrameImplTest.LoFiNotUpdatedOnSubframeCommits
* RenderViewImplTest.OnSetAccessibilityMode
I reverted locally multiple times to make sure, but RenderFrameImplTest.LoFiNotUpdatedOnSubframeCommits only starts failing when this CL is committed, AFAICT.
Original issue's description:
> media: Enable Unified Media Pipeline for MSE and EME on Android
>
> Enables Mojo Media on Android to support EME in the unified media
> pipeline. This introduces MojoCdm, MojoAudioDecoder and encrytped
> stream support in AndroidVideoDecodeAccelerator.
>
> This CL also enables MSE in the unified media pipeline. The fallback
> logic for MSE (IsUnifiedMediaPipelineEnabledForMse()) is removed.
>
> Also partially reverts f92f4e5c849c028db73fbe06912685a77b978ee4 which
> added "LoadType" in createMediaPlayer() to implement the fallback
> logic for MSE.
>
> BUG=455905,521731
> TEST=Encrypted audio/video plays in default Chrome for Android build
> with and without unified media pipeline.
>
> Committed: https://crrev.com/92d0fffc36695c099005bf05862145a89d918f28
> Cr-Commit-Position: refs/heads/master@{#383331}
TBR=dalecurtis@chromium.org,ddorwin@chromium.org,timav@chromium.org,wolenetz@chromium.org,pfeldman@chromium.org,xhwang@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=455905,521731
Review URL: https://codereview.chromium.org/1840563002
Cr-Commit-Position: refs/heads/master@{#383409}
Diffstat (limited to 'third_party/WebKit/Source/core/loader/EmptyClients.h')
| -rw-r--r-- | third_party/WebKit/Source/core/loader/EmptyClients.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h index da0e924..911a8c5 100644 --- a/third_party/WebKit/Source/core/loader/EmptyClients.h +++ b/third_party/WebKit/Source/core/loader/EmptyClients.h @@ -47,6 +47,7 @@ #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> @@ -246,7 +247,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&, const WebURL&, WebMediaPlayerClient*) override; + PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, WebMediaPlayer::LoadType, const WebURL&, WebMediaPlayerClient*) override; PassOwnPtr<WebMediaSession> createWebMediaSession() override; ObjectContentType getObjectContentType(const KURL&, const String&, bool) override { return ObjectContentType(); } |