Add flag for drawing layers to screen with Ganesh

cc/output/gl_renderer.h

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_OUTPUT_GL_RENDERER_H_
 #define CC_OUTPUT_GL_RENDERER_H_
 
 #include "base/cancelable_callback.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/scoped_ptr_vector.h"
@@ skipping 27 matching lines @@
 // Class that handles drawing of composited render layers using GL.
 class CC_EXPORT GLRenderer
   : public DirectRenderer,
     public NON_EXPORTED_BASE(
         WebKit::WebGraphicsContext3D::
             WebGraphicsMemoryAllocationChangedCallbackCHROMIUM) {
  public:
   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();
 
   virtual const RendererCapabilities& Capabilities() const OVERRIDE;
 
   WebKit::WebGraphicsContext3D* Context();
 
   virtual void ViewportChanged() OVERRIDE;
 
   // Waits for rendering to finish.
@@ skipping 19 matching lines @@
                           int line);
 
  protected:
   GLRenderer(RendererClient* client,
              OutputSurface* output_surface,
              ResourceProvider* resource_provider,
              int highp_threshold_min);
 
   bool IsBackbufferDiscarded() const { return is_backbuffer_discarded_; }
   bool Initialize();
+  void InitializeGrContext();
 
   const gfx::QuadF& SharedGeometryQuad() const { return shared_geometry_quad_; }
   const GeometryBinding* SharedGeometry() const {
     return shared_geometry_.get();
   }
 
   void GetFramebufferPixelsAsync(gfx::Rect rect,
                                  bool flipped_y,
                                  CopyRenderPassCallback callback);
   bool GetFramebufferTexture(ScopedResource* resource, gfx::Rect device_rect);
@@ skipping 46 matching lines @@
   void DrawIOSurfaceQuad(const DrawingFrame* frame,
                          const IOSurfaceDrawQuad* quad);
   void DrawTileQuad(const DrawingFrame* frame, const TileDrawQuad* quad);
   void DrawContentQuad(const DrawingFrame* frame,
                        const ContentDrawQuadBase* quad,
                        ResourceProvider::ResourceId resource_id);
   void DrawYUVVideoQuad(const DrawingFrame* frame,
                         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);
   void DrawQuadGeometry(const DrawingFrame* frame,
                         const gfx::Transform& draw_transform,
                         const gfx::RectF& quad_rect,
                         int matrix_location);
   void SetBlendEnabled(bool enabled);
   bool blend_enabled() const { return blend_shadow_; }
   void SetUseProgram(unsigned program);
@@ skipping 35 matching lines @@
       unsigned source_buffer,
       uint8_t* dest_pixels,
       gfx::Size size,
       bool flipped_y);
   void PassOnSkBitmap(
       scoped_ptr<SkBitmap> bitmap,
       scoped_ptr<SkAutoLockPixels> lock,
       const CopyRenderPassCallback& callback,
       bool success);
 
+  void ReinitializeGrCanvas();
+  void ReinitializeGLState();
+
+  bool CanUseGanesh() const;
+
   // WebKit::
   // WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM
   // implementation.
   virtual void onMemoryAllocationChanged(
       WebKit::WebGraphicsMemoryAllocation allocation) OVERRIDE;
   void DiscardBackbuffer();
   void EnsureBackbuffer();
   void EnforceMemoryPolicy();
 
   RendererCapabilities capabilities_;
@@ skipping 166 matching lines @@
   scoped_ptr<VideoYUVProgram> video_yuv_program_highp_;
   scoped_ptr<VideoStreamTextureProgram> video_stream_texture_program_highp_;
 
   scoped_ptr<DebugBorderProgram> debug_border_program_;
   scoped_ptr<SolidColorProgram> solid_color_program_;
   scoped_ptr<SolidColorProgramAA> solid_color_program_aa_;
 
   OutputSurface* output_surface_;
   WebKit::WebGraphicsContext3D* context_;
 
+  skia::RefPtr<class GrContext> gr_context_;

[danakj, 2013/05/15 20:33:16]

need the "class"? I don't see a method with the name

[enne (OOO), 2013/05/15 22:34:38]

Done.

+  SkAutoTUnref<SkCanvas> sk_canvas_;

[danakj, 2013/05/15 20:33:16]

skia::RefPtr > SkAutoTUnref

[enne (OOO), 2013/05/15 22:34:38]

Done.

+
   gfx::Rect swap_buffer_rect_;
   gfx::Rect scissor_rect_;
   bool is_viewport_changed_;
   bool is_backbuffer_discarded_;
   bool discard_backbuffer_when_not_visible_;
   bool is_using_bind_uniform_;
   bool visible_;
   bool is_scissor_enabled_;
   bool blend_shadow_;
   unsigned program_shadow_;
@@ skipping 23 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x)                                                        \
   (x, GLRenderer::DebugGLCall(&* context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_GL_RENDERER_H_