Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

components/display_compositor/buffer_queue_unittest.cc

 // Copyright 2014 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.
 
 #include "components/display_compositor/buffer_queue.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 67 matching lines @@
 
 #if defined(OS_WIN)
 const gpu::SurfaceHandle kFakeSurfaceHandle =
     reinterpret_cast<gpu::SurfaceHandle>(1);
 #else
 const gpu::SurfaceHandle kFakeSurfaceHandle = 1;
 #endif
 
 class MockBufferQueue : public BufferQueue {
  public:
-  MockBufferQueue(gpu::gles2::GLES2Interface* gl,
+  MockBufferQueue(scoped_refptr<cc::ContextProvider> context_provider,
                   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
                   unsigned int target,
                   unsigned int internalformat)
-      : BufferQueue(gl,
+      : BufferQueue(context_provider,
                     target,
                     internalformat,
                     nullptr,
                     gpu_memory_buffer_manager,
                     kFakeSurfaceHandle) {}
   MOCK_METHOD4(CopyBufferDamage,
                void(int, int, const gfx::Rect&, const gfx::Rect&));
 };
 
 class BufferQueueTest : public ::testing::Test {
  public:
   BufferQueueTest() : doublebuffering_(true), first_frame_(true) {}
 
   void SetUp() override {
     InitWithContext(cc::TestWebGraphicsContext3D::Create());
   }
 
   void InitWithContext(std::unique_ptr<cc::TestWebGraphicsContext3D> context) {
-    context_provider_ = cc::TestContextProvider::Create(std::move(context));
-    context_provider_->BindToCurrentThread();
+    scoped_refptr<cc::TestContextProvider> context_provider =
+        cc::TestContextProvider::Create(std::move(context));
+    context_provider->BindToCurrentThread();
     gpu_memory_buffer_manager_.reset(new StubGpuMemoryBufferManager);
-    mock_output_surface_ = new MockBufferQueue(context_provider_->ContextGL(),
-                                               gpu_memory_buffer_manager_.get(),
-                                               GL_TEXTURE_2D, GL_RGBA);
+    mock_output_surface_ =
+        new MockBufferQueue(context_provider, gpu_memory_buffer_manager_.get(),
+                            GL_TEXTURE_2D, GL_RGBA);
     output_surface_.reset(mock_output_surface_);
     output_surface_->Initialize();
   }
 
   unsigned current_surface() {
     return output_surface_->current_surface_
                ? output_surface_->current_surface_->image
                : 0;
   }
   const std::vector<std::unique_ptr<BufferQueue::AllocatedSurface>>&
@@ skipping 57 matching lines @@
  protected:
   bool InsertUnique(std::set<unsigned>* set, unsigned value) {
     if (!value)
       return true;
     if (set->find(value) != set->end())
       return false;
     set->insert(value);
     return true;
   }
 
-  scoped_refptr<cc::TestContextProvider> context_provider_;
   std::unique_ptr<StubGpuMemoryBufferManager> gpu_memory_buffer_manager_;
   std::unique_ptr<BufferQueue> output_surface_;
   MockBufferQueue* mock_output_surface_;
   bool doublebuffering_;
   bool first_frame_;
 };
 
 namespace {
 const gfx::Size screen_size = gfx::Size(30, 30);
 const gfx::Rect screen_rect = gfx::Rect(screen_size);
@@ skipping 26 matching lines @@
  public:
   void SetUp() override {
     context_ = new MockedContext();
     InitWithContext(std::unique_ptr<cc::TestWebGraphicsContext3D>(context_));
   }
 
  protected:
   MockedContext* context_;
 };
 
-scoped_refptr<cc::TestContextProvider> CreateMockedContextProvider(
-    MockedContext** context) {
-  std::unique_ptr<MockedContext> owned_context(new MockedContext);
-  *context = owned_context.get();
+std::unique_ptr<BufferQueue> CreateOutputSurfaceWithMock(
+    unsigned int target,
+    MockedContext** context,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
+  *context = new MockedContext();
   scoped_refptr<cc::TestContextProvider> context_provider =
-      cc::TestContextProvider::Create(std::move(owned_context));
+      cc::TestContextProvider::Create(
+          std::unique_ptr<cc::TestWebGraphicsContext3D>(*context));
   context_provider->BindToCurrentThread();
-  return context_provider;
-}
-
-std::unique_ptr<BufferQueue> CreateBufferQueue(
-    unsigned int target,
-    gpu::gles2::GLES2Interface* gl,
-    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
   std::unique_ptr<BufferQueue> buffer_queue(
-      new BufferQueue(gl, target, GL_RGBA, nullptr, gpu_memory_buffer_manager,
-                      kFakeSurfaceHandle));
+      new BufferQueue(context_provider, target, GL_RGBA, nullptr,
+                      gpu_memory_buffer_manager, kFakeSurfaceHandle));
   buffer_queue->Initialize();
   return buffer_queue;
 }
 
 TEST(BufferQueueStandaloneTest, FboInitialization) {
   MockedContext* context;
-  scoped_refptr<cc::TestContextProvider> context_provider =
-      CreateMockedContextProvider(&context);
   std::unique_ptr<StubGpuMemoryBufferManager> gpu_memory_buffer_manager(
       new StubGpuMemoryBufferManager);
-  std::unique_ptr<BufferQueue> output_surface =
-      CreateBufferQueue(GL_TEXTURE_2D, context_provider->ContextGL(),
-                        gpu_memory_buffer_manager.get());
+  std::unique_ptr<BufferQueue> output_surface = CreateOutputSurfaceWithMock(
+      GL_TEXTURE_2D, &context, gpu_memory_buffer_manager.get());
 
   EXPECT_CALL(*context, bindFramebuffer(GL_FRAMEBUFFER, Ne(0U)));
   ON_CALL(*context, framebufferTexture2D(_, _, _, _, _))
       .WillByDefault(Return());
 
   output_surface->Reshape(gfx::Size(10, 20), 1.0f);
 }
 
 TEST(BufferQueueStandaloneTest, FboBinding) {
   GLenum targets[] = {GL_TEXTURE_2D, GL_TEXTURE_RECTANGLE_ARB};
   for (size_t i = 0; i < 2; ++i) {
     GLenum target = targets[i];
-
     MockedContext* context;
-    scoped_refptr<cc::TestContextProvider> context_provider =
-        CreateMockedContextProvider(&context);
     std::unique_ptr<StubGpuMemoryBufferManager> gpu_memory_buffer_manager(
         new StubGpuMemoryBufferManager);
-    std::unique_ptr<BufferQueue> output_surface = CreateBufferQueue(
-        target, context_provider->ContextGL(), gpu_memory_buffer_manager.get());
-
+    std::unique_ptr<BufferQueue> output_surface = CreateOutputSurfaceWithMock(
+        target, &context, gpu_memory_buffer_manager.get());
     EXPECT_CALL(*context, bindTexture(target, Ne(0U)));
     EXPECT_CALL(*context, destroyImageCHROMIUM(1));
     Expectation image =
         EXPECT_CALL(*context, createImageCHROMIUM(_, 0, 0, GL_RGBA))
             .WillOnce(Return(1));
     Expectation fb =
         EXPECT_CALL(*context, bindFramebuffer(GL_FRAMEBUFFER, Ne(0U)));
     Expectation tex = EXPECT_CALL(*context, bindTexture(target, Ne(0U)));
     Expectation bind_tex =
         EXPECT_CALL(*context, bindTexImage2DCHROMIUM(target, 1))
             .After(tex, image);
     EXPECT_CALL(*context,
                 framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                                      target, Ne(0U), _))
         .After(fb, bind_tex);
 
     output_surface->BindFramebuffer();
   }
 }
 
 TEST(BufferQueueStandaloneTest, CheckBoundFramebuffer) {
-  scoped_refptr<cc::TestContextProvider> context_provider =
-      cc::TestContextProvider::Create();
-  context_provider->BindToCurrentThread();
   std::unique_ptr<StubGpuMemoryBufferManager> gpu_memory_buffer_manager;
   std::unique_ptr<BufferQueue> output_surface;
+  scoped_refptr<cc::TestContextProvider> context_provider =
+      cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create());
+  context_provider->BindToCurrentThread();
   gpu_memory_buffer_manager.reset(new StubGpuMemoryBufferManager);
 
   std::unique_ptr<GLHelper> gl_helper;
   gl_helper.reset(new GLHelper(context_provider->ContextGL(),
                                context_provider->ContextSupport()));
 
-  output_surface.reset(new BufferQueue(
-      context_provider->ContextGL(), GL_TEXTURE_2D, GL_RGBA, gl_helper.get(),
-      gpu_memory_buffer_manager.get(), kFakeSurfaceHandle));
+  output_surface.reset(
+      new BufferQueue(context_provider, GL_TEXTURE_2D, GL_RGBA, gl_helper.get(),
+                      gpu_memory_buffer_manager.get(), kFakeSurfaceHandle));
   output_surface->Initialize();
   output_surface->Reshape(screen_size, 1.0f);
   // Trigger a sub-buffer copy to exercise all paths.
   output_surface->BindFramebuffer();
   output_surface->SwapBuffers(screen_rect);
   output_surface->PageFlipComplete();
   output_surface->BindFramebuffer();
   output_surface->SwapBuffers(small_damage);
 
   int current_fbo = 0;
@@ skipping 308 matching lines @@
   testing::Mock::VerifyAndClearExpectations(mock_output_surface_);
   EXPECT_CALL(*mock_output_surface_,
               CopyBufferDamage(target_texture, source_texture, small_damage, _))
       .Times(1);
   output_surface_->SwapBuffers(small_damage);
   testing::Mock::VerifyAndClearExpectations(mock_output_surface_);
 }
 
 }  // namespace
 }  // namespace display_compositor