Index: content/renderer/media/webmediaplayer_impl.h |
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h |
index d933302c6bd94281fa4a714f7b526fb1723dfc41..2bf91f36901c8da47dacd8c9e0a03179ca5f01ed 100644 |
--- a/content/renderer/media/webmediaplayer_impl.h |
+++ b/content/renderer/media/webmediaplayer_impl.h |
@@ -13,6 +13,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/threading/thread.h" |
+#include "cc/resources/media/skcanvas_video_renderer.h" |
#include "content/renderer/media/buffered_data_source_host_impl.h" |
#include "content/renderer/media/crypto/proxy_decryptor.h" |
#include "content/renderer/media/video_frame_compositor.h" |
@@ -22,10 +23,8 @@ |
#include "media/base/media_keys.h" |
#include "media/base/pipeline.h" |
#include "media/base/text_track.h" |
-#include "media/filters/skcanvas_video_renderer.h" |
#include "skia/ext/platform_canvas.h" |
#include "third_party/WebKit/public/platform/WebAudioSourceProvider.h" |
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
#include "url/gurl.h" |
@@ -34,6 +33,7 @@ class RenderAudioSourceProvider; |
namespace blink { |
class WebContentDecryptionModule; |
+class WebGraphicsContext3D; |
class WebLocalFrame; |
} |
@@ -132,7 +132,7 @@ class WebMediaPlayerImpl |
unsigned int internal_format, |
unsigned int type, |
bool premultiply_alpha, |
- bool flip_y); |
+ bool flip_y) OVERRIDE; |
virtual blink::WebAudioSourceProvider* audioSourceProvider(); |
@@ -321,7 +321,7 @@ class WebMediaPlayerImpl |
// Video rendering members. |
scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_; |
VideoFrameCompositor* compositor_; // Deleted on |compositor_task_runner_|. |
- media::SkCanvasVideoRenderer skcanvas_video_renderer_; |
+ cc::SkCanvasVideoRenderer skcanvas_video_renderer_; |
// The compositor layer for displaying the video content when using composited |
// playback. |