Defer compositor context creation to the thread.

cc/output/overlay_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 <stddef.h>
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/base/region.h"
@@ skipping 115 matching lines @@
 DefaultOverlayProcessor::DefaultOverlayProcessor(OutputSurface* surface)
     : OverlayProcessor(surface) {
 }
 
 size_t DefaultOverlayProcessor::GetStrategyCount() {
   return strategies_.size();
 }
 
 class OverlayOutputSurface : public OutputSurface {
  public:
-  explicit OverlayOutputSurface(scoped_refptr<ContextProvider> context_provider)
-      : OutputSurface(context_provider) {
+  explicit OverlayOutputSurface(
+      std::unique_ptr<ContextProvider::Factory> compositor_context_factory)
+      : OutputSurface(std::move(compositor_context_factory)) {
     surface_size_ = kDisplaySize;
     device_scale_factor_ = 1;
     is_displayed_as_overlay_plane_ = true;
   }
 
   void SetScaleFactor(float scale_factor) {
     device_scale_factor_ = scale_factor;
   }
 
   // OutputSurface implementation
@@ skipping 181 matching lines @@
       EXPECT_EQ(exp_iter->shared_quad_state->quad_layer_bounds.ToString(),
                 act_iter->shared_quad_state->quad_layer_bounds.ToString());
     }
   }
 }
 
 template <typename OverlayCandidateValidatorType>
 class OverlayTest : public testing::Test {
  protected:
   void SetUp() override {
-    provider_ = TestContextProvider::Create();
-    output_surface_.reset(new OverlayOutputSurface(provider_));
+    output_surface_.reset(new OverlayOutputSurface(
+        base::MakeUnique<TestContextProvider::Factory>()));
     EXPECT_TRUE(output_surface_->BindToClient(&client_));
     output_surface_->SetOverlayCandidateValidator(
         new OverlayCandidateValidatorType);
 
     shared_bitmap_manager_.reset(new TestSharedBitmapManager());
     resource_provider_ = FakeResourceProvider::Create(
         output_surface_.get(), shared_bitmap_manager_.get());
 
     overlay_processor_.reset(new OverlayProcessor(output_surface_.get()));
     overlay_processor_->Initialize();
   }
 
-  scoped_refptr<TestContextProvider> provider_;
   std::unique_ptr<OverlayOutputSurface> output_surface_;
   FakeOutputSurfaceClient client_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<OverlayProcessor> overlay_processor_;
   gfx::Rect damage_rect_;
 };
 
 typedef OverlayTest<SingleOnTopOverlayValidator> SingleOverlayOnTopTest;
 typedef OverlayTest<UnderlayOverlayValidator> UnderlayTest;
 typedef OverlayTest<CALayerValidator> CALayerOverlayTest;
 
 TEST(OverlayTest, NoOverlaysByDefault) {
-  scoped_refptr<TestContextProvider> provider = TestContextProvider::Create();
-  OverlayOutputSurface output_surface(provider);
+  OverlayOutputSurface output_surface(
+      base::MakeUnique<TestContextProvider::Factory>());
   EXPECT_EQ(NULL, output_surface.GetOverlayCandidateValidator());
 
   output_surface.SetOverlayCandidateValidator(new SingleOverlayValidator);
   EXPECT_TRUE(output_surface.GetOverlayCandidateValidator() != NULL);
 }
 
 TEST(OverlayTest, OverlaysProcessorHasStrategy) {
-  scoped_refptr<TestContextProvider> provider = TestContextProvider::Create();
-  OverlayOutputSurface output_surface(provider);
+  OverlayOutputSurface output_surface(
+      base::MakeUnique<TestContextProvider::Factory>());
   FakeOutputSurfaceClient client;
   EXPECT_TRUE(output_surface.BindToClient(&client));
   output_surface.SetOverlayCandidateValidator(new SingleOverlayValidator);
 
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
   std::unique_ptr<ResourceProvider> resource_provider =
       FakeResourceProvider::Create(&output_surface,
                                    shared_bitmap_manager.get());
 
@@ skipping 808 matching lines @@
                void(int plane_z_order,
                     gfx::OverlayTransform plane_transform,
                     unsigned overlay_texture_id,
                     const gfx::Rect& display_bounds,
                     const gfx::RectF& uv_rect));
 };
 
 class GLRendererWithOverlaysTest : public testing::Test {
  protected:
   GLRendererWithOverlaysTest() {
-    provider_ = TestContextProvider::Create();
-    output_surface_.reset(new OverlayOutputSurface(provider_));
+    output_surface_.reset(new OverlayOutputSurface(
+        base::MakeUnique<TestContextProvider::Factory>()));
     CHECK(output_surface_->BindToClient(&output_surface_client_));
+    provider_ =
+        static_cast<TestContextProvider*>(output_surface_->context_provider());
     resource_provider_ =
         FakeResourceProvider::Create(output_surface_.get(), nullptr);
 
     provider_->support()->SetScheduleOverlayPlaneCallback(base::Bind(
         &MockOverlayScheduler::Schedule, base::Unretained(&scheduler_)));
   }
 
   void Init(bool use_validator) {
     if (use_validator)
       output_surface_->SetOverlayCandidateValidator(new SingleOverlayValidator);
@@ skipping 11 matching lines @@
   void SwapBuffersWithoutComplete() {
     renderer_->SwapBuffers(CompositorFrameMetadata());
   }
   void SwapBuffersComplete() {
     output_surface_->OnSwapBuffersComplete();
     renderer_->SwapBuffersComplete();
   }
 
   RendererSettings settings_;
   FakeOutputSurfaceClient output_surface_client_;
+  TestContextProvider* provider_ = nullptr;
   std::unique_ptr<OverlayOutputSurface> output_surface_;
   FakeRendererClient renderer_client_;
   std::unique_ptr<ResourceProvider> resource_provider_;
   std::unique_ptr<OverlayInfoRendererGL> renderer_;
-  scoped_refptr<TestContextProvider> provider_;
   MockOverlayScheduler scheduler_;
 };
 
 TEST_F(GLRendererWithOverlaysTest, OverlayQuadNotDrawn) {
   bool use_validator = true;
   Init(use_validator);
   renderer_->set_expect_overlays(true);
   gfx::Rect viewport_rect(16, 16);
 
   std::unique_ptr<RenderPass> pass = CreateRenderPass();
@@ skipping 375 matching lines @@
 
   // This completion corresponds to the third frame.
   SwapBuffersComplete();
   EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1));
   EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2));
   EXPECT_FALSE(resource_provider_->InUseByConsumer(resource3));
 }
 
 }  // namespace
 }  // namespace cc