| Index: content/renderer/media/webmediaplayer_ms.h
|
| diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
|
| index 6b2debf2f7202f57647e84edb00e4eeb58ec9c8c..fa3c81ccef529f12a4e496882dc374706ee474ac 100644
|
| --- a/content/renderer/media/webmediaplayer_ms.h
|
| +++ b/content/renderer/media/webmediaplayer_ms.h
|
| @@ -13,6 +13,7 @@
|
| #include "cc/layers/video_frame_provider.h"
|
| #include "media/blink/skcanvas_video_renderer.h"
|
| #include "media/blink/webmediaplayer_util.h"
|
| +#include "media/renderers/gpu_video_accelerator_factories.h"
|
| #include "skia/ext/platform_canvas.h"
|
| #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
|
| #include "url/gurl.h"
|
| @@ -57,13 +58,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);
|
|
|
| virtual ~WebMediaPlayerMS();
|
|
|
| @@ -231,6 +235,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_;
|
|
|