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::Factory> compositor_context_factory,
     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)),
+      compositor_context_factory_(std::move(compositor_context_factory)),
       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::Factory> compositor_context_factory)
+    : OutputSurface(std::move(compositor_context_factory),
                     nullptr,
                     nullptr,
-                    nullptr) {
-}
+                    nullptr) {}
 
 OutputSurface::OutputSurface(
-    scoped_refptr<ContextProvider> context_provider,
+    std::unique_ptr<ContextProvider::Factory> compositor_context_factory,
     scoped_refptr<ContextProvider> worker_context_provider)
-    : OutputSurface(std::move(context_provider),
+    : OutputSurface(std::move(compositor_context_factory),
                     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::Factory> compositor_context_factory,
     std::unique_ptr<SoftwareOutputDevice> software_device)
-    : OutputSurface(std::move(context_provider),
+    : OutputSurface(std::move(compositor_context_factory),
                     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) {
-      context_provider_->SetLostContextCallback(base::Bind(
+  if (compositor_context_factory_) {
+    compositor_context_provider_ = compositor_context_factory_->CreateContext();
+    if (compositor_context_provider_) {
+      compositor_context_provider_->SetLostContextCallback(base::Bind(
           &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
     }
+    success = !!compositor_context_provider_;
+    // Don't keep around the dead Factory.
+    compositor_context_factory_ = 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(
         this, "OutputSurface", base::ThreadTaskRunnerHandle::Get());
   }
 
   if (!success)
     DetachFromClient();
   return success;
 }
 
 void OutputSurface::DetachFromClient() {
   DetachFromClientInternal();
 }
 
 void OutputSurface::EnsureBackbuffer() {
   if (software_device_)
     software_device_->EnsureBackbuffer();
 }
 
 void OutputSurface::DiscardBackbuffer() {
-  if (context_provider_.get())
-    context_provider_->ContextGL()->DiscardBackbufferCHROMIUM();
+  if (compositor_context_provider_)
+    compositor_context_provider_->ContextGL()->DiscardBackbufferCHROMIUM();
   if (software_device_)
     software_device_->DiscardBackbuffer();
 }
 
 void OutputSurface::Reshape(const gfx::Size& size,
                             float scale_factor,
                             bool has_alpha) {
   if (size == surface_size_ && scale_factor == device_scale_factor_ &&
       has_alpha == has_alpha_)
     return;
 
   surface_size_ = size;
   device_scale_factor_ = scale_factor;
   has_alpha_ = has_alpha;
-  if (context_provider_.get()) {
-    context_provider_->ContextGL()->ResizeCHROMIUM(size.width(), size.height(),
-                                                   scale_factor, has_alpha);
+  if (compositor_context_provider_) {
+    compositor_context_provider_->ContextGL()->ResizeCHROMIUM(
+        size.width(), size.height(), scale_factor, has_alpha);
   }
   if (software_device_)
     software_device_->Resize(size, scale_factor);
 }
 
 void OutputSurface::BindFramebuffer() {
-  DCHECK(context_provider_.get());
-  context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
+  DCHECK(compositor_context_provider_);
+  compositor_context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
 void OutputSurface::PostSwapBuffersComplete() {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&OutputSurface::OnSwapBuffersComplete,
                             weak_ptr_factory_.GetWeakPtr()));
 }
 
 // We don't post tasks bound to the client directly since they might run
 // after the OutputSurface has been destroyed.
@@ skipping 71 matching lines @@
 
 void OutputSurface::DetachFromClientInternal() {
   DCHECK(client_thread_checker_.CalledOnValidThread());
   DCHECK(client_);
 
   // Unregister any dump provider. Safe to call (no-op) if we have not yet
   // registered.
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
 
-  if (context_provider_.get()) {
-    context_provider_->SetLostContextCallback(
+  if (compositor_context_provider_) {
+    compositor_context_provider_->SetLostContextCallback(
         ContextProvider::LostContextCallback());
   }
-  context_provider_ = nullptr;
+  compositor_context_provider_ = nullptr;
   client_ = nullptr;
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace cc