content/renderer/render_frame_impl.cc - Issue 1370453002: Introduce WebMediaSession

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1370453002: Introduce WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Expect no platform implementation on !ANDROID Created 5 years, 3 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

« content/renderer/media/android/webmediasession_android.cc ('K') | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/Source/bindings/core/v8/CallbackPromiseAdapter.h » ('j') | third_party/WebKit/Source/modules/mediasession/MediaSession.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 5aed77678c39a1043d68ca080963acf06148d014..591acea6f035c6e23faa28750b30b735474a5a04 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -174,6 +174,7 @@

#include "content/renderer/media/android/renderer_media_player_manager.h"

#include "content/renderer/media/android/stream_texture_factory_impl.h"

#include "content/renderer/media/android/webmediaplayer_android.h"

+#include "content/renderer/media/android/webmediasession_android.h"

#else

#include "cc/blink/context_provider_web_context.h"

#include "content/renderer/usb/web_usb_client_impl.h"

@@ -217,6 +218,7 @@ using blink::WebLocalFrame;

using blink::WebMediaPlayer;

using blink::WebMediaPlayerClient;

using blink::WebMediaPlayerEncryptedMediaClient;

+using blink::WebMediaSession;

using blink::WebNavigationPolicy;

using blink::WebNavigationType;

using blink::WebNode;

@@ -2121,6 +2123,15 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(

#endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)

}

+WebMediaSession* RenderFrameImpl::createMediaSession(

+ blink::WebLocalFrame* frame) {

+#if defined(OS_ANDROID)

+ return CreateAndroidWebMediaSession();

+#else

+ return nullptr;

+#endif // defined(OS_ANDROID)

blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(

blink::WebLocalFrame* frame,

blink::WebApplicationCacheHostClient* client) {

@@ -5050,6 +5061,11 @@ RendererMediaPlayerManager* RenderFrameImpl::GetMediaPlayerManager() {

media_player_manager_ = new RendererMediaPlayerManager(this);

return media_player_manager_;

}

+WebMediaSession* RenderFrameImpl::CreateAndroidWebMediaSession() {

mlamouri (slow - plz ping) 2015/09/28 15:16:03 Do we need this level of indirection?

davve 2015/10/06 12:05:13 Probably not, no. If we ever get CreateAndroidWebM

+ return new WebMediaSessionAndroid();

#endif // defined(OS_ANDROID)

scoped_ptr<media::MediaPermission> RenderFrameImpl::CreateMediaPermissionProxy(