| Index: webkit/media/webmediaplayer_proxy.h
|
| diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h
|
| index b80a4a0468e0ff12f16542365c4d9e1ee60dd177..35d563016ef3891904a8390c63b78b69c5014362 100644
|
| --- a/webkit/media/webmediaplayer_proxy.h
|
| +++ b/webkit/media/webmediaplayer_proxy.h
|
| @@ -15,8 +15,8 @@
|
| #include "media/base/pipeline.h"
|
| #include "media/filters/chunk_demuxer.h"
|
| #include "media/filters/ffmpeg_video_decoder.h"
|
| +#include "media/filters/skcanvas_video_renderer.h"
|
| #include "webkit/media/buffered_data_source.h"
|
| -#include "webkit/media/skcanvas_video_renderer.h"
|
|
|
| class SkCanvas;
|
|
|
| @@ -124,7 +124,7 @@ class WebMediaPlayerProxy
|
|
|
| scoped_refptr<BufferedDataSource> data_source_;
|
| scoped_refptr<media::VideoRendererBase> frame_provider_;
|
| - SkCanvasVideoRenderer video_renderer_;
|
| + media::SkCanvasVideoRenderer video_renderer_;
|
|
|
| base::Lock lock_;
|
| int outstanding_repaints_;
|
|
|