blimp: Make Blimp client use a Display for compositing.

blimp/client/feature/compositor/blimp_compositor.cc

 // Copyright 2015 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 "blimp/client/feature/compositor/blimp_compositor.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/feature/compositor/blimp_context_provider.h"
+#include "blimp/client/feature/compositor/blimp_delegating_output_surface.h"
 #include "blimp/client/feature/compositor/blimp_output_surface.h"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/layer.h"
 #include "cc/output/output_surface.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/trees/layer_tree_host.h"
 #include "net/base/net_errors.h"
 #include "ui/gl/gl_surface.h"
 
 namespace blimp {
@@ skipping 221 matching lines @@
 
 void BlimpCompositor::HandlePendingOutputSurfaceRequest() {
   DCHECK(output_surface_request_pending_);
 
   // We might have had a request from a LayerTreeHost that was then
   // hidden (and hidden means we don't have a native surface).
   // Also make sure we only handle this once.
   if (!host_->visible() || window_ == gfx::kNullAcceleratedWidget)
     return;
 
-  scoped_refptr<BlimpContextProvider> context_provider =
+  scoped_refptr<BlimpContextProvider> display_context_provider =
       BlimpContextProvider::Create(window_,
                                    client_->GetGpuMemoryBufferManager());
+  scoped_refptr<BlimpContextProvider> compositor_context_provider =
+      BlimpContextProvider::Create(gfx::kNullAcceleratedWidget,
+                                   client_->GetGpuMemoryBufferManager());
+  scoped_refptr<BlimpContextProvider> worker_context_provider = nullptr;

[Wez, 2016/08/12 01:56:49]

nit: No need for = nullptr here.

+  // TODO(khushalsagar): Make a worker context and bind it to the current
+  // thread:
+  // Worker context is bound to the main thread in RenderThreadImpl. One day
+  // that will change and then this will have to be removed.
+  // worker_context_provider->BindToCurrentThread();

[Wez, 2016/08/12 01:56:49]

This is commented out; what is it that will one day have to be removed? :P

[danakj, 2016/08/12 18:16:53]

When the context isn't null, this will have to be called. Until one day when we
move worker context binding off main thread.

 
-  host_->SetOutputSurface(
-      base::WrapUnique(new BlimpOutputSurface(context_provider)));
+  auto display_output_surface =
+      base::MakeUnique<BlimpOutputSurface>(std::move(display_context_provider));
+  auto delegating_output_surface =
+      base::MakeUnique<BlimpDelegatingOutputSurface>(
+          std::move(compositor_context_provider),
+          std::move(worker_context_provider), std::move(display_output_surface),
+          client_->GetGpuMemoryBufferManager(),
+          host_->settings().renderer_settings,
+          client_->GetCompositorTaskRunner().get());
+
+  host_->SetOutputSurface(std::move(delegating_output_surface));
   output_surface_request_pending_ = false;
 }
 
 }  // namespace client
 }  // namespace blimp