| Index: cc/output/direct_renderer.h
|
| diff --git a/cc/output/direct_renderer.h b/cc/output/direct_renderer.h
|
| index 4baadeecbfbfd34f7312747441ae2abda5f3c2d8..562b4a8e745f8ce9f30fcc0fd3ac7fea0d6a0230 100644
|
| --- a/cc/output/direct_renderer.h
|
| +++ b/cc/output/direct_renderer.h
|
| @@ -50,7 +50,9 @@ class CC_EXPORT DirectRenderer : public Renderer {
|
| void SetEnlargePassTextureAmountForTesting(gfx::Vector2d amount);
|
|
|
| protected:
|
| - DirectRenderer(RendererClient* client, ResourceProvider* resource_provider);
|
| + DirectRenderer(RendererClient* client,
|
| + OutputSurface* output_surface,
|
| + ResourceProvider* resource_provider);
|
|
|
| class CachedResource : public ScopedResource {
|
| public:
|
| @@ -80,9 +82,10 @@ class CC_EXPORT DirectRenderer : public Renderer {
|
| const gfx::RectF& quad_rect);
|
| static void InitializeMatrices(DrawingFrame* frame,
|
| gfx::Rect draw_rect,
|
| + gfx::Rect window_rect,
|
| bool flip_y);
|
| - static gfx::Rect MoveScissorToWindowSpace(const DrawingFrame* frame,
|
| - const gfx::RectF& scissor_rect);
|
| + gfx::Rect MoveScissorToWindowSpace(const DrawingFrame* frame,
|
| + const gfx::RectF& scissor_rect);
|
| static gfx::RectF ComputeScissorRectForRenderPass(const DrawingFrame* frame);
|
| void SetScissorStateForQuad(const DrawingFrame* frame, const DrawQuad& quad);
|
| void SetScissorStateForQuadWithRenderPassScissor(
|
| @@ -100,8 +103,8 @@ class CC_EXPORT DirectRenderer : public Renderer {
|
| virtual void BindFramebufferToOutputSurface(DrawingFrame* frame) = 0;
|
| virtual bool BindFramebufferToTexture(DrawingFrame* frame,
|
| const ScopedResource* resource,
|
| - gfx::Rect framebuffer_rect) = 0;
|
| - virtual void SetDrawViewportSize(gfx::Size viewport_size) = 0;
|
| + gfx::Rect target_rect) = 0;
|
| + virtual void SetDrawViewport(gfx::Rect viewport) = 0;
|
| virtual void SetScissorTestRect(gfx::Rect scissor_rect) = 0;
|
| virtual void ClearFramebuffer(DrawingFrame* frame) = 0;
|
| virtual void DoDrawQuad(DrawingFrame* frame, const DrawQuad* quad) = 0;
|
| @@ -117,6 +120,7 @@ class CC_EXPORT DirectRenderer : public Renderer {
|
| scoped_ptr<CopyOutputRequest> request) = 0;
|
|
|
| ScopedPtrHashMap<RenderPass::Id, CachedResource> render_pass_textures_;
|
| + OutputSurface* output_surface_;
|
| ResourceProvider* resource_provider_;
|
|
|
| private:
|
|
|