| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index 66f08af3f89567270221fc2938f9c22284429843..db6e8898090f2164352f78d44278a74a9738e9bb 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -19,6 +19,7 @@
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsMemoryAllocation.h"
|
| #include "ui/gfx/quad_f.h"
|
| +#include "webkit/gpu/grcontext_for_webgraphicscontext3d.h"
|
|
|
| namespace cc {
|
|
|
| @@ -141,6 +142,8 @@ class CC_EXPORT GLRenderer
|
| const YUVVideoDrawQuad* quad);
|
| void DrawPictureQuad(const DrawingFrame* frame,
|
| const PictureDrawQuad* quad);
|
| + void DrawPictureQuadDirectToBackbuffer(const DrawingFrame* frame,
|
| + const PictureDrawQuad* quad);
|
|
|
| void SetShaderOpacity(float opacity, int alpha_location);
|
| void SetShaderQuadF(const gfx::QuadF& quad, int quad_location);
|
| @@ -177,6 +180,9 @@ class CC_EXPORT GLRenderer
|
| bool InitializeSharedObjects();
|
| void CleanupSharedObjects();
|
|
|
| + void ReinitializeGrContext();
|
| + void ReinitializeGLState();
|
| +
|
| // WebKit::
|
| // WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM
|
| // implementation.
|
| @@ -353,6 +359,8 @@ class CC_EXPORT GLRenderer
|
|
|
| OutputSurface* output_surface_;
|
| WebKit::WebGraphicsContext3D* context_;
|
| + scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_;
|
| + SkAutoTUnref<SkCanvas> sk_canvas_;
|
|
|
| gfx::Rect swap_buffer_rect_;
|
| gfx::Rect scissor_rect_;
|
|
|