| Index: cc/output/gl_renderer.h
|
| diff --git a/cc/output/gl_renderer.h b/cc/output/gl_renderer.h
|
| index c83169dfc6acd3b2b4925c7ce0a9bbd476613f3f..61f41b7a161c8c61b2cf7f55fb4c49e503794839 100644
|
| --- a/cc/output/gl_renderer.h
|
| +++ b/cc/output/gl_renderer.h
|
| @@ -45,7 +45,8 @@ class CC_EXPORT GLRenderer
|
| static scoped_ptr<GLRenderer> Create(RendererClient* client,
|
| OutputSurface* output_surface,
|
| ResourceProvider* resource_provider,
|
| - int highp_threshold_min);
|
| + int highp_threshold_min,
|
| + bool use_ganesh);
|
|
|
| virtual ~GLRenderer();
|
|
|
| @@ -85,6 +86,7 @@ class CC_EXPORT GLRenderer
|
|
|
| bool IsBackbufferDiscarded() const { return is_backbuffer_discarded_; }
|
| bool Initialize();
|
| + void InitializeGrContext();
|
|
|
| const gfx::QuadF& SharedGeometryQuad() const { return shared_geometry_quad_; }
|
| const GeometryBinding* SharedGeometry() const {
|
| @@ -151,6 +153,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);
|
| @@ -206,6 +210,11 @@ class CC_EXPORT GLRenderer
|
| const CopyRenderPassCallback& callback,
|
| bool success);
|
|
|
| + void ReinitializeGrCanvas();
|
| + void ReinitializeGLState();
|
| +
|
| + bool CanUseGanesh() const;
|
| +
|
| // WebKit::
|
| // WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM
|
| // implementation.
|
| @@ -392,6 +401,9 @@ class CC_EXPORT GLRenderer
|
| OutputSurface* output_surface_;
|
| WebKit::WebGraphicsContext3D* context_;
|
|
|
| + skia::RefPtr<class GrContext> gr_context_;
|
| + SkAutoTUnref<SkCanvas> sk_canvas_;
|
| +
|
| gfx::Rect swap_buffer_rect_;
|
| gfx::Rect scissor_rect_;
|
| bool is_viewport_changed_;
|
|
|