| Index: webkit/media/webmediaplayer_proxy.h
|
| diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
|
| index a0d007b4c89ea505da894f12c02b87a55ee64331..f34947b63838b476d8d6560d37758d1bbcb16790 100644
|
| --- a/webkit/media/webmediaplayer_proxy.h
|
| +++ b/webkit/media/webmediaplayer_proxy.h
|
| @@ -22,7 +22,7 @@ class Rect;
|
| namespace webkit_media {
|
|
|
| class WebMediaPlayerImpl;
|
| -class WebVideoRenderer;
|
| +class VideoRendererImpl;
|
|
|
| // Acts as a thread proxy between the various threads used for multimedia and
|
| // the render thread that WebMediaPlayerImpl is running on.
|
| @@ -35,12 +35,11 @@ class WebMediaPlayerProxy
|
|
|
| // Methods for Filter -> WebMediaPlayerImpl communication.
|
| void Repaint();
|
| - void SetVideoRenderer(scoped_refptr<WebVideoRenderer> video_renderer);
|
| + void SetVideoRenderer(const scoped_refptr<VideoRendererImpl>& video_renderer);
|
| WebDataSourceBuildObserverHack GetBuildObserver();
|
|
|
| // Methods for WebMediaPlayerImpl -> Filter communication.
|
| void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect);
|
| - void SetSize(const gfx::Rect& rect);
|
| void Detach();
|
| void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out);
|
| void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame);
|
| @@ -104,7 +103,7 @@ class WebMediaPlayerProxy
|
| typedef std::list<scoped_refptr<WebDataSource> > DataSourceList;
|
| DataSourceList data_sources_;
|
|
|
| - scoped_refptr<WebVideoRenderer> video_renderer_;
|
| + scoped_refptr<VideoRendererImpl> video_renderer_;
|
|
|
| base::Lock lock_;
|
| int outstanding_repaints_;
|
|
|