Index: media/blink/webmediaplayer_params.h |
diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h |
index c765548d4b009b10b8ea77c98f4ea512be62ef54..57d6fb2f5a3495e9a0103a861daa437d3817995f 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; |
@@ -46,13 +47,12 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
const EncryptedMediaPlayerSupportCreateCB& |
encrypted_media_player_support_cb, |
+ const Context3DProviderCB& shared_main_thread_context_3d_provider_cb, |
scherkus (not reviewing)
2014/10/30 20:40:12
naming suggestion: just use "context_3d_provider_c
dshwang
2014/10/31 09:29:16
That's right! Done.
|
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 +84,12 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
scoped_ptr<EncryptedMediaPlayerSupport> |
CreateEncryptedMediaPlayerSupport(blink::WebMediaPlayerClient* client) const; |
+ Context3DProviderCB shared_main_thread_context_3d_provider_cb() const { |
+ return shared_main_thread_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 +97,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 shared_main_thread_context_3d_provider_cb_; |
blink::WebContentDecryptionModule* initial_cdm_; |
DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); |