| Index: cc/software_renderer.h
|
| diff --git a/cc/software_renderer.h b/cc/software_renderer.h
|
| index 92961cacbc43aeb230241089b0feb522fc54f980..4e059ca7a8ae3b758ece620d70fd4c221886694b 100644
|
| --- a/cc/software_renderer.h
|
| +++ b/cc/software_renderer.h
|
| @@ -7,7 +7,14 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "cc/direct_renderer.h"
|
| -#include <public/WebCompositorSoftwareOutputDevice.h>
|
| +
|
| +namespace WebKit {
|
| +class WebCompositorSoftwareOutputDevice;
|
| +}
|
| +
|
| +namespace media {
|
| +class SkCanvasVideoRenderer;
|
| +}
|
|
|
| namespace cc {
|
|
|
| @@ -18,6 +25,7 @@ class SolidColorDrawQuad;
|
| class TextureDrawQuad;
|
| class TileDrawQuad;
|
| class RenderPassDrawQuad;
|
| +class VideoFrameDrawQuad;
|
|
|
| class SoftwareRenderer : public DirectRenderer {
|
| public:
|
| @@ -58,6 +66,7 @@ private:
|
| void drawTextureQuad(const DrawingFrame&, const TextureDrawQuad*);
|
| void drawTileQuad(const DrawingFrame&, const TileDrawQuad*);
|
| void drawRenderPassQuad(const DrawingFrame& frame, const RenderPassDrawQuad*);
|
| + void drawVideoFrameQuad(const DrawingFrame& frame, const VideoFrameDrawQuad*);
|
| void drawUnsupportedQuad(const DrawingFrame&, const DrawQuad*);
|
|
|
| RendererCapabilities m_capabilities;
|
| @@ -68,6 +77,7 @@ private:
|
| SkCanvas* m_skCurrentCanvas;
|
| SkPaint m_skCurrentPaint;
|
| scoped_ptr<ResourceProvider::ScopedWriteLockSoftware> m_currentFramebufferLock;
|
| + scoped_ptr<media::SkCanvasVideoRenderer> m_videoRenderer;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
|
| };
|
|
|