cc: Delete the Renderer base class.

cc/output/direct_renderer.h

 // Copyright 2012 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_DIRECT_RENDERER_H_
 #define CC_OUTPUT_DIRECT_RENDERER_H_
 
 #include <unordered_map>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/ca_layer_overlay.h"
 #include "cc/output/overlay_processor.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
 #include "gpu/command_buffer/common/texture_in_use_response.h"
 #include "ui/gfx/geometry/quad_f.h"
 
 namespace cc {
 class DrawPolygon;
 class ResourceProvider;
+typedef std::vector<std::unique_ptr<RenderPass>> RenderPassList;
+
+class CC_EXPORT DirectRendererClient {
+ public:
+  virtual void SetFullRootLayerDamage() = 0;
+};
 
 // This is the base class for code shared between the GL and software
 // renderer implementations.  "Direct" refers to the fact that it does not
 // delegate rendering to another compositor.
-class CC_EXPORT DirectRenderer : public Renderer {
+class CC_EXPORT DirectRenderer {
  public:
-  ~DirectRenderer() override;
+  DirectRenderer(DirectRendererClient* client,
+                 const RendererSettings* settings,
+                 OutputSurface* output_surface,
+                 ResourceProvider* resource_provider);
+  virtual ~DirectRenderer();
 
   void DecideRenderPassAllocationsForFrame(
-      const RenderPassList& render_passes_in_draw_order) override;
-  bool HasAllocatedResourcesForTesting(RenderPassId id) const override;
+      const RenderPassList& render_passes_in_draw_order);
+  bool HasAllocatedResourcesForTesting(RenderPassId id) const;
   void DrawFrame(RenderPassList* render_passes_in_draw_order,
                  float device_scale_factor,
                  const gfx::ColorSpace& device_color_space,
                  const gfx::Rect& device_viewport_rect,
-                 const gfx::Rect& device_clip_rect) override;
+                 const gfx::Rect& device_clip_rect);
+  virtual void SwapBuffers(CompositorFrameMetadata metadata) = 0;
+
+  virtual const RendererCapabilitiesImpl& Capabilities() const = 0;
+
+  // DO THIS: protected:

[enne (OOO), 2016/08/08 21:41:18]

?

   virtual void SwapBuffersComplete() {}
   virtual void DidReceiveTextureInUseResponses(
       const gpu::TextureInUseResponses& responses) {}
 
   // If a pass contains a single tile draw quad and can be drawn without
   // a render pass (e.g. applying a filter directly to the tile quad)
   // return that quad, otherwise return null.
   virtual const TileDrawQuad* CanPassBeDrawnDirectly(const RenderPass* pass);
 
   struct CC_EXPORT DrawingFrame {
@@ skipping 27 matching lines @@
                      const gfx::Rect& render_pass_scissor,
                      bool use_render_pass_scissor);
 
  protected:
   enum SurfaceInitializationMode {
     SURFACE_INITIALIZATION_MODE_PRESERVE,
     SURFACE_INITIALIZATION_MODE_SCISSORED_CLEAR,
     SURFACE_INITIALIZATION_MODE_FULL_SURFACE_CLEAR,
   };
 
-  DirectRenderer(RendererClient* client,
-                 const RendererSettings* settings,
-                 OutputSurface* output_surface,
-                 ResourceProvider* resource_provider);
-
   static gfx::RectF QuadVertexRect();
   static void QuadRectTransform(gfx::Transform* quad_rect_transform,
                                 const gfx::Transform& quad_transform,
                                 const gfx::RectF& quad_rect);
   void InitializeViewport(DrawingFrame* frame,
                           const gfx::Rect& draw_rect,
                           const gfx::Rect& viewport_rect,
                           const gfx::Size& surface_size);
   gfx::Rect MoveFromDrawToWindowSpace(const DrawingFrame* frame,
                                       const gfx::Rect& draw_rect) const;
@@ skipping 36 matching lines @@
   // with clip_region will be drawn.
   virtual void DoDrawQuad(DrawingFrame* frame,
                           const DrawQuad* quad,
                           const gfx::QuadF* clip_region) = 0;
   virtual void BeginDrawingFrame(DrawingFrame* frame) = 0;
   virtual void FinishDrawingFrame(DrawingFrame* frame) = 0;
   virtual void FinishDrawingQuadList();
   virtual bool FlippedFramebuffer(const DrawingFrame* frame) const = 0;
   virtual void EnsureScissorTestEnabled() = 0;
   virtual void EnsureScissorTestDisabled() = 0;
-  virtual void DiscardBackbuffer() {}
-  virtual void EnsureBackbuffer() {}
 
   virtual void CopyCurrentRenderPassToBitmap(
       DrawingFrame* frame,
       std::unique_ptr<CopyOutputRequest> request) = 0;
 
+  DirectRendererClient* const client_;
+  const RendererSettings* const settings_;
+  OutputSurface* const output_surface_;
+  ResourceProvider* const resource_provider_;
+
   // TODO(danakj): Just use a vector of pairs here? Hash map is way overkill.
   std::unordered_map<RenderPassId,
                      std::unique_ptr<ScopedResource>,
                      RenderPassIdHash>
       render_pass_textures_;
   std::unordered_map<RenderPassId, TileDrawQuad, RenderPassIdHash>
       render_pass_bypass_quads_;
-  OutputSurface* output_surface_;
-  ResourceProvider* resource_provider_;
   std::unique_ptr<OverlayProcessor> overlay_processor_;
 
   // For use in coordinate conversion, this stores the output rect, viewport
   // rect (= unflipped version of glViewport rect), the size of target
   // framebuffer, and the current window space viewport. During a draw, this
   // stores the values for the current render pass; in between draws, they
   // retain the values for the root render pass of the last draw.
   gfx::Rect current_draw_rect_;
   gfx::Rect current_viewport_rect_;
   gfx::Size current_surface_size_;
   gfx::Rect current_window_space_viewport_;
 
  private:
   gfx::Size enlarge_pass_texture_amount_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectRenderer);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_DIRECT_RENDERER_H_