Chromium Code Reviews| Index: content/renderer/media/webmediaplayer_ms.h |
| diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h |
| index 4493f07d298952009f012bad6668a4065002c881..09b47828fc95645df3d1707e003e5eca879bf9bb 100644 |
| --- a/content/renderer/media/webmediaplayer_ms.h |
| +++ b/content/renderer/media/webmediaplayer_ms.h |
| @@ -14,6 +14,7 @@ |
| #include "media/blink/skcanvas_video_renderer.h" |
| #include "media/blink/webmediaplayer_util.h" |
| #include "media/filters/video_renderer_algorithm.h" |
| +#include "media/renderers/gpu_video_accelerator_factories.h" |
|
mcasas
2015/10/07 23:44:55
nit: I think you can forward declare media::GpuVid
emircan
2015/10/08 01:44:24
It causes a compile error regarding ref counting.
|
| #include "skia/ext/platform_canvas.h" |
| #include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
| #include "url/gurl.h" |
| @@ -58,13 +59,16 @@ class WebMediaPlayerMS |
| public: |
| // Construct a WebMediaPlayerMS with reference to the client, and |
| // a MediaStreamClient which provides VideoFrameProvider. |
| - WebMediaPlayerMS(blink::WebFrame* frame, |
| - blink::WebMediaPlayerClient* client, |
| - base::WeakPtr<media::WebMediaPlayerDelegate> delegate, |
| - media::MediaLog* media_log, |
| - scoped_ptr<MediaStreamRendererFactory> factory, |
| - const scoped_refptr<base::SingleThreadTaskRunner>& |
| - compositor_task_runner); |
| + WebMediaPlayerMS( |
| + blink::WebFrame* frame, |
| + blink::WebMediaPlayerClient* client, |
| + base::WeakPtr<media::WebMediaPlayerDelegate> delegate, |
| + media::MediaLog* media_log, |
| + scoped_ptr<MediaStreamRendererFactory> factory, |
| + const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, |
| + const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
| + const scoped_refptr<base::TaskRunner>& worker_task_runner, |
| + const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories); |
| ~WebMediaPlayerMS() override; |
| @@ -268,6 +272,9 @@ class WebMediaPlayerMS |
| scoped_ptr<MediaStreamRendererFactory> renderer_factory_; |
| + const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
| + const scoped_refptr<base::TaskRunner> worker_task_runner_; |
| + const scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_; |
| // Used for DCHECKs to ensure methods calls executed in the correct thread. |
| base::ThreadChecker thread_checker_; |