cc::SkiaRenderer hack prototype

cc/output/skia_renderer.h

Index: cc/output/skia_renderer.h
diff --git a/cc/output/software_renderer.h b/cc/output/skia_renderer.h
similarity index 78%
copy from cc/output/software_renderer.h
copy to cc/output/skia_renderer.h
index 9323358d8cefb4717099e56cfaf00ed8f6363bcd..8dd9538402af773c196fee8b2313bc15e928e333 100644
--- a/cc/output/software_renderer.h
+++ b/cc/output/skia_renderer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_
-#define CC_OUTPUT_SOFTWARE_RENDERER_H_
+#ifndef CC_OUTPUT_SKIA_RENDERER_H_
+#define CC_OUTPUT_SKIA_RENDERER_H_
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
@@ -24,16 +24,16 @@ class SolidColorDrawQuad;
 class TextureDrawQuad;
 class TileDrawQuad;
 
-class CC_EXPORT SoftwareRenderer : public DirectRenderer {
+class CC_EXPORT SkiaRenderer : public DirectRenderer {
  public:
-  static std::unique_ptr<SoftwareRenderer> Create(
+  static std::unique_ptr<SkiaRenderer> Create(
       RendererClient* client,
       const RendererSettings* settings,
       OutputSurface* output_surface,
       ResourceProvider* resource_provider,
       bool use_image_hijack_canvas);
 
-  ~SoftwareRenderer() override;
+  ~SkiaRenderer() override;
   const RendererCapabilitiesImpl& Capabilities() const override;
   void Finish() override;
   void SwapBuffers(const CompositorFrameMetadata& metadata) override;
@@ -61,13 +61,14 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
       DrawingFrame* frame,
       std::unique_ptr<CopyOutputRequest> request) override;
 
-  SoftwareRenderer(RendererClient* client,
-                   const RendererSettings* settings,
-                   OutputSurface* output_surface,
-                   ResourceProvider* resource_provider,
-                   bool use_image_hijack_canvas);
+  SkiaRenderer(RendererClient* client,
+               const RendererSettings* settings,
+               OutputSurface* output_surface,
+               ResourceProvider* resource_provider,
+               bool use_image_hijack_canvas);
 
   void DidChangeVisibility() override;
+  void FinishDrawingQuadList() override;
 
  private:
   void ClearCanvas(SkColor color);
@@ -77,18 +78,14 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
 
   void DrawDebugBorderQuad(const DrawingFrame* frame,
                            const DebugBorderDrawQuad* quad);
-  void DrawPictureQuad(const DrawingFrame* frame,
-                       const PictureDrawQuad* quad);
+  void DrawPictureQuad(const DrawingFrame* frame, const PictureDrawQuad* quad);
   void DrawRenderPassQuad(const DrawingFrame* frame,
                           const RenderPassDrawQuad* quad);
   void DrawSolidColorQuad(const DrawingFrame* frame,
                           const SolidColorDrawQuad* quad);
-  void DrawTextureQuad(const DrawingFrame* frame,
-                       const TextureDrawQuad* quad);
-  void DrawTileQuad(const DrawingFrame* frame,
-                    const TileDrawQuad* quad);
-  void DrawUnsupportedQuad(const DrawingFrame* frame,
-                           const DrawQuad* quad);
+  void DrawTextureQuad(const DrawingFrame* frame, const TextureDrawQuad* quad);
+  void DrawTileQuad(const DrawingFrame* frame, const TileDrawQuad* quad);
+  void DrawUnsupportedQuad(const DrawingFrame* frame, const DrawQuad* quad);
   bool ShouldApplyBackgroundFilters(const RenderPassDrawQuad* quad) const;
   sk_sp<SkImage> ApplyImageFilter(SkImageFilter* filter,
                                   const RenderPassDrawQuad* quad,
@@ -109,13 +106,14 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   bool is_backbuffer_discarded_;
   gfx::Rect scissor_rect_;
 
-  SoftwareOutputDevice* output_device_;
+  sk_sp<SkSurface> root_surface_;
   SkCanvas* root_canvas_;
   SkCanvas* current_canvas_;
   SkPaint current_paint_;
-  std::unique_ptr<ResourceProvider::ScopedWriteLockSoftware>
+  std::unique_ptr<ResourceProvider::ScopedWriteLockGL>
       current_framebuffer_lock_;
-  sk_sp<SkCanvas> current_framebuffer_canvas_;
+  std::unique_ptr<ResourceProvider::ScopedSkSurfaceProvider>
+      current_framebuffer_surface_lock_;
 
   // Indicates whether content rasterization should happen through an
   // ImageHijackCanvas, which causes image decodes to be managed by an
@@ -124,9 +122,9 @@ class CC_EXPORT SoftwareRenderer : public DirectRenderer {
   // cannot use the GPU IDC.
   const bool use_image_hijack_canvas_;
 
-  DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
+  DISALLOW_COPY_AND_ASSIGN(SkiaRenderer);
 };
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_SOFTWARE_RENDERER_H_
+#endif  // CC_OUTPUT_SKIA_RENDERER_H_