cc: Delete the Renderer base class.

cc/output/gl_renderer_unittest.cc

Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index b596162c35cca5e6ce22b0ef24726602229f3439..2ef415455eb503f592c94edc4e58bc125b03d27e 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -20,11 +20,11 @@
 #include "cc/output/texture_mailbox_deleter.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/resource_provider.h"
+#include "cc/test/fake_direct_renderer_client.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
-#include "cc/test/fake_renderer_client.h"
 #include "cc/test/fake_resource_provider.h"
 #include "cc/test/pixel_test.h"
 #include "cc/test/render_pass_test_utils.h"
@@ -65,11 +65,11 @@ class GLRendererTest : public testing::Test {
   RenderPass* root_render_pass() {
     return render_passes_in_draw_order_.back().get();
   }
-  void DrawFrame(Renderer* renderer, const gfx::Rect& viewport_rect) {
+  void DrawFrame(GLRenderer* renderer, const gfx::Rect& viewport_rect) {
     renderer->DrawFrame(&render_passes_in_draw_order_, 1.f, gfx::ColorSpace(),
                         viewport_rect, viewport_rect);
   }
-  void DrawFrame(Renderer* renderer,
+  void DrawFrame(GLRenderer* renderer,
                  const gfx::Rect& viewport_rect,
                  const gfx::Rect& clip_rect) {
     renderer->DrawFrame(&render_passes_in_draw_order_, 1.f, gfx::ColorSpace(),
@@ -313,7 +313,7 @@ INSTANTIATE_TEST_CASE_P(MaskShadersCompile,
 
 class FakeRendererGL : public GLRenderer {
  public:
-  FakeRendererGL(RendererClient* client,
+  FakeRendererGL(DirectRendererClient* client,
                  const RendererSettings* settings,
                  OutputSurface* output_surface,
                  ResourceProvider* resource_provider)
@@ -324,7 +324,7 @@ class FakeRendererGL : public GLRenderer {
                    NULL,
                    0) {}
 
-  FakeRendererGL(RendererClient* client,
+  FakeRendererGL(DirectRendererClient* client,
                  const RendererSettings* settings,
                  OutputSurface* output_surface,
                  ResourceProvider* resource_provider,
@@ -343,7 +343,6 @@ class FakeRendererGL : public GLRenderer {
   // GLRenderer methods.
 
   // Changing visibility to public.
-  using GLRenderer::IsBackbufferDiscarded;
   using GLRenderer::DoDrawQuad;
   using GLRenderer::BeginDrawingFrame;
   using GLRenderer::FinishDrawingQuadList;
@@ -370,7 +369,7 @@ class GLRendererWithDefaultHarnessTest : public GLRendererTest {
   RendererSettings settings_;
   FakeOutputSurfaceClient output_surface_client_;
   std::unique_ptr<FakeOutputSurface> output_surface_;
-  FakeRendererClient renderer_client_;
+  FakeDirectRendererClient renderer_client_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<FakeRendererGL> renderer_;
@@ -492,7 +491,7 @@ class GLRendererShaderTest : public GLRendererTest {
   RendererSettings settings_;
   FakeOutputSurfaceClient output_surface_client_;
   std::unique_ptr<FakeOutputSurface> output_surface_;
-  FakeRendererClient renderer_client_;
+  FakeDirectRendererClient renderer_client_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<FakeRendererGL> renderer_;
@@ -500,64 +499,6 @@ class GLRendererShaderTest : public GLRendererTest {
 
 namespace {
 
-// Test GLRenderer DiscardBackbuffer functionality:
-// Suggest discarding framebuffer when one exists and the renderer is not
-// visible.
-// Expected: it is discarded and damage tracker is reset.
-TEST_F(
-    GLRendererWithDefaultHarnessTest,
-    SuggestBackbufferNoShouldDiscardBackbufferAndDamageRootLayerIfNotVisible) {
-  renderer_->SetVisible(false);
-  EXPECT_EQ(1, renderer_client_.set_full_root_layer_damage_count());
-  EXPECT_TRUE(renderer_->IsBackbufferDiscarded());
-}
-
-// Test GLRenderer DiscardBackbuffer functionality:
-// Suggest discarding framebuffer when one exists and the renderer is visible.
-// Expected: the allocation is ignored.
-TEST_F(GLRendererWithDefaultHarnessTest,
-       SuggestBackbufferNoDoNothingWhenVisible) {
-  renderer_->SetVisible(true);
-  EXPECT_EQ(0, renderer_client_.set_full_root_layer_damage_count());
-  EXPECT_FALSE(renderer_->IsBackbufferDiscarded());
-}
-
-// Test GLRenderer DiscardBackbuffer functionality:
-// Suggest discarding framebuffer when one does not exist.
-// Expected: it does nothing.
-TEST_F(GLRendererWithDefaultHarnessTest,
-       SuggestBackbufferNoWhenItDoesntExistShouldDoNothing) {
-  renderer_->SetVisible(false);
-  EXPECT_EQ(1, renderer_client_.set_full_root_layer_damage_count());
-  EXPECT_TRUE(renderer_->IsBackbufferDiscarded());
-
-  EXPECT_EQ(1, renderer_client_.set_full_root_layer_damage_count());
-  EXPECT_TRUE(renderer_->IsBackbufferDiscarded());
-}
-
-// Test GLRenderer DiscardBackbuffer functionality:
-// Begin drawing a frame while a framebuffer is discarded.
-// Expected: will recreate framebuffer.
-TEST_F(GLRendererWithDefaultHarnessTest,
-       DiscardedBackbufferIsRecreatedForScopeDuration) {
-  gfx::Rect viewport_rect(1, 1);
-  renderer_->SetVisible(false);
-  EXPECT_TRUE(renderer_->IsBackbufferDiscarded());
-  EXPECT_EQ(1, renderer_client_.set_full_root_layer_damage_count());
-
-  AddRenderPass(&render_passes_in_draw_order_,
-                RenderPassId(1, 0),
-                viewport_rect,
-                gfx::Transform());
-
-  renderer_->SetVisible(true);
-  DrawFrame(renderer_.get(), viewport_rect);
-  EXPECT_FALSE(renderer_->IsBackbufferDiscarded());
-
-  SwapBuffers();
-  EXPECT_EQ(1u, output_surface_->num_sent_frames());
-}
-
 TEST_F(GLRendererWithDefaultHarnessTest, ExternalStencil) {
   gfx::Rect viewport_rect(1, 1);
   EXPECT_FALSE(renderer_->stencil_enabled());
@@ -684,7 +625,7 @@ TEST_F(GLRendererTest, InitializationDoesNotMakeSynchronousCalls) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -720,7 +661,7 @@ TEST_F(GLRendererTest, InitializationWithQuicklyLostContextDoesNotAssert) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -754,7 +695,7 @@ TEST_F(GLRendererTest, OpaqueBackground) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -796,7 +737,7 @@ TEST_F(GLRendererTest, TransparentBackground) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -831,7 +772,7 @@ TEST_F(GLRendererTest, OffscreenOutputSurface) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -890,7 +831,7 @@ TEST_F(GLRendererTest, ActiveTextureState) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -974,7 +915,7 @@ TEST_F(GLRendererTest, ShouldClearRootRenderPass) {
   RendererSettings settings;
   settings.should_clear_root_render_pass = false;
 
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -1059,7 +1000,7 @@ TEST_F(GLRendererTest, ScissorTestWhenClearing) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -1150,7 +1091,7 @@ TEST_F(GLRendererTest, NoDiscardOnPartialUpdates) {
 
   RendererSettings settings;
   settings.partial_swap_enabled = true;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -1284,7 +1225,7 @@ TEST_F(GLRendererTest, ScissorAndViewportWithinNonreshapableSurface) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client,
                           &settings,
                           output_surface.get(),
@@ -1323,7 +1264,7 @@ TEST_F(GLRendererTest, DrawFramePreservesFramebuffer) {
                                    shared_bitmap_manager.get());
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client, &settings, output_surface.get(),
                           resource_provider.get());
   EXPECT_FALSE(renderer.Capabilities().using_partial_swap);
@@ -1752,7 +1693,7 @@ class MockOutputSurfaceTest : public GLRendererTest {
   StrictMock<MockOutputSurface> output_surface_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
-  FakeRendererClient renderer_client_;
+  FakeDirectRendererClient renderer_client_;
   std::unique_ptr<FakeRendererGL> renderer_;
 };
 
@@ -1856,7 +1797,7 @@ TEST_F(GLRendererTest, DontOverlayWithCopyRequests) {
       new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get()));
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client, &settings, output_surface.get(),
                           resource_provider.get(), mailbox_deleter.get());
 
@@ -2014,7 +1955,7 @@ TEST_F(GLRendererTest, OverlaySyncTokensAreProcessed) {
       new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get()));
 
   RendererSettings settings;
-  FakeRendererClient renderer_client;
+  FakeDirectRendererClient renderer_client;
   FakeRendererGL renderer(&renderer_client, &settings, output_surface.get(),
                           resource_provider.get(), mailbox_deleter.get());
 
@@ -2092,7 +2033,7 @@ class GLRendererPartialSwapTest : public GLRendererTest {
 
     RendererSettings settings;
     settings.partial_swap_enabled = partial_swap;
-    FakeRendererClient renderer_client;
+    FakeDirectRendererClient renderer_client;
     FakeRendererGL renderer(&renderer_client, &settings, output_surface.get(),
                             resource_provider.get());
     EXPECT_EQ(partial_swap, renderer.Capabilities().using_partial_swap);