Index: media/blink/webmediaplayer_params.h |
diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h |
index c765548d4b009b10b8ea77c98f4ea512be62ef54..c65f8c5041186afe32485756e305aa424f05099c 100644 |
--- a/media/blink/webmediaplayer_params.h |
+++ b/media/blink/webmediaplayer_params.h |
@@ -9,6 +9,7 @@ |
#include "base/memory/ref_counted.h" |
#include "media/base/media_export.h" |
#include "media/blink/encrypted_media_player_support.h" |
+#include "media/filters/context_3d_provider.h" |
namespace base { |
class SingleThreadTaskRunner; |
@@ -33,9 +34,10 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
typedef base::Callback<scoped_ptr<EncryptedMediaPlayerSupport>( |
blink::WebMediaPlayerClient*)> EncryptedMediaPlayerSupportCreateCB; |
typedef base::Callback<void(const base::Closure&)> DeferLoadCB; |
+ typedef base::Callback<Context3DProvider()> Context3DProviderCB; |
- // |defer_load_cb|, |audio_renderer_sink|, and |compositor_task_runner| may be |
- // null. |
+ // |defer_load_cb|, |audio_renderer_sink|, |compositor_task_runner|, and |
+ // |context_3d_provider_cb| may be null. |
WebMediaPlayerParams( |
const DeferLoadCB& defer_load_cb, |
const scoped_refptr<AudioRendererSink>& audio_renderer_sink, |
@@ -46,13 +48,12 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
const EncryptedMediaPlayerSupportCreateCB& |
encrypted_media_player_support_cb, |
+ const Context3DProviderCB& context_3d_provider_cb, |
blink::WebContentDecryptionModule* initial_cdm); |
~WebMediaPlayerParams(); |
- base::Callback<void(const base::Closure&)> defer_load_cb() const { |
- return defer_load_cb_; |
- } |
+ DeferLoadCB defer_load_cb() const { return defer_load_cb_; } |
const scoped_refptr<AudioRendererSink>& audio_renderer_sink() const { |
return audio_renderer_sink_; |
@@ -84,8 +85,12 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
scoped_ptr<EncryptedMediaPlayerSupport> |
CreateEncryptedMediaPlayerSupport(blink::WebMediaPlayerClient* client) const; |
+ Context3DProviderCB context_3d_provider_cb() const { |
+ return context_3d_provider_cb_; |
+ } |
+ |
private: |
- base::Callback<void(const base::Closure&)> defer_load_cb_; |
+ DeferLoadCB defer_load_cb_; |
scoped_refptr<AudioRendererSink> audio_renderer_sink_; |
const AudioHardwareConfig& audio_hardware_config_; |
scoped_refptr<MediaLog> media_log_; |
@@ -93,6 +98,7 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
EncryptedMediaPlayerSupportCreateCB encrypted_media_player_support_cb_; |
+ Context3DProviderCB context_3d_provider_cb_; |
blink::WebContentDecryptionModule* initial_cdm_; |
DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); |