Carry WebMediaSession in WebMediaPlayerParams

media/blink/webmediaplayer_params.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "media/blink/media_blink_export.h"
 #include "media/filters/context_3d.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 class TaskRunner;
 }
 
 namespace blink {
 class WebContentDecryptionModule;
 class WebMediaPlayerClient;
+class WebMediaSession;
 }
 
 namespace media {
 
 class RestartableAudioRendererSink;
 class MediaLog;
 class MediaPermission;
 
 // Holds parameters for constructing WebMediaPlayerImpl without having
 // to plumb arguments through various abstraction layers.
@@ skipping 14 matching lines @@
   WebMediaPlayerParams(
       const DeferLoadCB& defer_load_cb,
       const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink,
       const scoped_refptr<MediaLog>& media_log,
       const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
       const scoped_refptr<base::TaskRunner>& worker_task_runner,
       const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
       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();
 
   DeferLoadCB defer_load_cb() const { return defer_load_cb_; }
 
   const scoped_refptr<RestartableAudioRendererSink>& audio_renderer_sink()
       const {
     return audio_renderer_sink_;
   }
 
@@ skipping 19 matching lines @@
   MediaPermission* media_permission() const { return media_permission_; }
 
   blink::WebContentDecryptionModule* initial_cdm() const {
     return initial_cdm_;
   }
 
   AdjustAllocatedMemoryCB adjust_allocated_memory_cb() const {
     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 method usually makes me
suspicious but it seems to be a common pattern around WebMediaPlayerParams here
:/

[davve, 2016/02/19 09:15:07]

Returning a const WebMediaSession sounds fine to me, at least for now.

+
  private:
   DeferLoadCB defer_load_cb_;
   scoped_refptr<RestartableAudioRendererSink> audio_renderer_sink_;
   scoped_refptr<MediaLog> media_log_;
   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
   scoped_refptr<base::TaskRunner> worker_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
   Context3DCB context_3d_cb_;
   AdjustAllocatedMemoryCB adjust_allocated_memory_cb_;
 
   // TODO(xhwang): Remove after prefixed EME API support is removed.
   MediaPermission* media_permission_;
   blink::WebContentDecryptionModule* initial_cdm_;
 
+  blink::WebMediaSession* media_session_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_