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

Unified Diff: media/blink/webmediaplayer_params.h

Issue 1648653002: Carry WebMediaSession in WebMediaPlayerParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 | « content/renderer/render_frame_impl.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_params.h
diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h
index 9ed1f8218271ed20bded646524675aa074095c87..254eadc3243168f13c07ffcf97047c30077dca5f 100644
--- a/media/blink/webmediaplayer_params.h
+++ b/media/blink/webmediaplayer_params.h
@@ -21,6 +21,7 @@ class TaskRunner;
namespace blink {
class WebContentDecryptionModule;
class WebMediaPlayerClient;
+class WebMediaSession;
}
namespace media {
@@ -55,7 +56,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
const Context3DCB& context_3d,
const AdjustAllocatedMemoryCB& adjust_allocated_memory_cb,
MediaPermission* media_permission,
- blink::WebContentDecryptionModule* initial_cdm);
+ blink::WebContentDecryptionModule* initial_cdm,
+ blink::WebMediaSession* media_session);
~WebMediaPlayerParams();
@@ -95,6 +97,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
return adjust_allocated_memory_cb_;
}
+ blink::WebMediaSession* media_session() const { return media_session_; }
whywhat 2016/02/17 16:52:02 nit: returning a non-const object from a const met
davve 2016/02/19 09:15:07 Returning a const WebMediaSession sounds fine to m
+
private:
DeferLoadCB defer_load_cb_;
scoped_refptr<RestartableAudioRendererSink> audio_renderer_sink_;
@@ -109,6 +113,8 @@ class MEDIA_BLINK_EXPORT WebMediaPlayerParams {
MediaPermission* media_permission_;
blink::WebContentDecryptionModule* initial_cdm_;
+ blink::WebMediaSession* media_session_;
+
DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
};
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/blink/webmediaplayer_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698