Chromium Code Reviews| Index: media/blink/webmediaplayer_params.h |
| diff --git a/media/blink/webmediaplayer_params.h b/media/blink/webmediaplayer_params.h |
| index 0811902a9ba57bd781b39a9696ea50678ccc499b..0d5cdd204616ca2c53320f121daace54d6eeb3c0 100644 |
| --- a/media/blink/webmediaplayer_params.h |
| +++ b/media/blink/webmediaplayer_params.h |
| @@ -32,6 +32,7 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
| public: |
| typedef base::Callback<void(const base::Closure&)> DeferLoadCB; |
| typedef base::Callback<Context3D()> Context3DCB; |
| + typedef base::Callback<int64_t(int64_t)> AdjustAllocatedMemoryCB; |
|
xhwang
2015/10/25 17:01:56
Please add a comment for this callback. It wasn't
DaleCurtis
2015/10/27 23:14:20
Done.
|
| // |defer_load_cb|, |audio_renderer_sink|, |compositor_task_runner|, and |
| // |context_3d_cb| may be null. |
| @@ -43,6 +44,7 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
| 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); |
| @@ -79,6 +81,9 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
| return initial_cdm_; |
| } |
| + AdjustAllocatedMemoryCB adjust_allocated_memory_cb() const { |
| + return adjust_allocated_memory_cb_; |
| + } |
| private: |
| DeferLoadCB defer_load_cb_; |
| @@ -88,6 +93,7 @@ class MEDIA_EXPORT WebMediaPlayerParams { |
| 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_; |