Defer compositor context creation to the thread.

cc/output/output_surface.cc

 // Copyright (c) 2013 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 "cc/output/output_surface.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 101 matching lines @@
 
   base::trace_event::ProcessMemoryDump* pmd_;
   uint64_t share_group_tracing_guid_;
 
   DISALLOW_COPY_AND_ASSIGN(SkiaGpuTraceMemoryDump);
 };
 
 }  // namespace
 
 OutputSurface::OutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create,
     scoped_refptr<ContextProvider> worker_context_provider,
     scoped_refptr<VulkanContextProvider> vulkan_context_provider,
     std::unique_ptr<SoftwareOutputDevice> software_device)
     : client_(NULL),
-      context_provider_(std::move(context_provider)),
+      context_provider_create_(std::move(context_provider_create)),
       worker_context_provider_(std::move(worker_context_provider)),
       vulkan_context_provider_(vulkan_context_provider),
       software_device_(std::move(software_device)),
       device_scale_factor_(-1),
       has_alpha_(true),
       external_stencil_test_enabled_(false),
       weak_ptr_factory_(this) {
   client_thread_checker_.DetachFromThread();
 }
 
-OutputSurface::OutputSurface(scoped_refptr<ContextProvider> context_provider)
-    : OutputSurface(std::move(context_provider),
+OutputSurface::OutputSurface(
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create)
+    : OutputSurface(std::move(context_provider_create),
                     nullptr,
                     nullptr,
-                    nullptr) {
-}
+                    nullptr) {}
 
 OutputSurface::OutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create,
     scoped_refptr<ContextProvider> worker_context_provider)
-    : OutputSurface(std::move(context_provider),
+    : OutputSurface(std::move(context_provider_create),
                     std::move(worker_context_provider),
                     nullptr,
-                    nullptr) {
-}
+                    nullptr) {}
 
 OutputSurface::OutputSurface(
     std::unique_ptr<SoftwareOutputDevice> software_device)
     : OutputSurface(nullptr,
                     nullptr,
                     nullptr,
                     std::move(software_device)) {
 }
 
 OutputSurface::OutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::DeferredCreate> context_provider_create,
     std::unique_ptr<SoftwareOutputDevice> software_device)
-    : OutputSurface(std::move(context_provider),
+    : OutputSurface(std::move(context_provider_create),
                     nullptr,
                     nullptr,
-                    std::move(software_device)) {
-}
+                    std::move(software_device)) {}
 
 // Forwarded to OutputSurfaceClient
 void OutputSurface::SetNeedsRedrawRect(const gfx::Rect& damage_rect) {
   TRACE_EVENT0("cc", "OutputSurface::SetNeedsRedrawRect");
   client_->SetNeedsRedrawRect(damage_rect);
 }
 
 void OutputSurface::ReclaimResources(const CompositorFrameAck* ack) {
   client_->ReclaimResources(ack);
 }
@@ skipping 18 matching lines @@
 
 void OutputSurface::ApplyExternalStencil() {}
 
 bool OutputSurface::BindToClient(OutputSurfaceClient* client) {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
   bool success = true;
 
-  if (context_provider_.get()) {
-    success = context_provider_->BindToCurrentThread();
-    if (success) {
+  if (context_provider_create_) {
+    context_provider_ = context_provider_create_->CreateContext();
+    if (context_provider_) {
       context_provider_->SetLostContextCallback(base::Bind(
           &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
     }
+    success = !!context_provider_;
+    // Don't keep around the dead DeferredCreate.
+    context_provider_create_ = nullptr;
   }
 
   // In certain cases, ThreadTaskRunnerHandle isn't set (Android Webview).
   // Don't register a dump provider in these cases.
   // TODO(ericrk): Get this working in Android Webview. crbug.com/517156
   if (base::ThreadTaskRunnerHandle::IsSet()) {
     // Now that we are on the context thread, register a dump provider with this
     // thread's task runner. This will overwrite any previous dump provider
     // registered.
     base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
@@ skipping 136 matching lines @@
   if (context_provider_.get()) {
     context_provider_->SetLostContextCallback(
         ContextProvider::LostContextCallback());
   }
   context_provider_ = nullptr;
   client_ = nullptr;
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace cc