[Work In Progress] Use worker context provider in SurfaceBinding

mandoline/ui/aura/surface_binding.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 "mandoline/ui/aura/surface_binding.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 16 matching lines @@
 
 namespace mandoline {
 namespace {
 
 // OutputSurface ---------------------------------------------------------------
 
 // OutputSurface implementation for a view. Pushes the surface id to View when
 // appropriate.
 class OutputSurfaceImpl : public cc::OutputSurface {
  public:
-  OutputSurfaceImpl(mojo::View* view,
-                    const scoped_refptr<cc::ContextProvider>& context_provider,
-                    mojo::Surface* surface,
-                    uint32_t id_namespace,
-                    uint32_t* next_local_id);
+  OutputSurfaceImpl(
+      mojo::View* view,
+      const scoped_refptr<cc::ContextProvider>& context_provider,
+      const scoped_refptr<cc::ContextProvider>& worker_context_provider,
+      mojo::Surface* surface,
+      uint32_t id_namespace,
+      uint32_t* next_local_id);
   ~OutputSurfaceImpl() override;
 
   // cc::OutputSurface:
   void SwapBuffers(cc::CompositorFrame* frame) override;
 
  private:
   mojo::View* view_;
   mojo::Surface* surface_;
   uint32_t id_namespace_;
   uint32_t* next_local_id_;  // Owned by PerViewManagerState.
   uint32_t local_id_;
   gfx::Size surface_size_;
 
   DISALLOW_COPY_AND_ASSIGN(OutputSurfaceImpl);
 };
 
 OutputSurfaceImpl::OutputSurfaceImpl(
     mojo::View* view,
     const scoped_refptr<cc::ContextProvider>& context_provider,
+    const scoped_refptr<cc::ContextProvider>& worker_context_provider,
     mojo::Surface* surface,
     uint32_t id_namespace,
     uint32_t* next_local_id)
-    : cc::OutputSurface(context_provider),
+    : cc::OutputSurface(context_provider, worker_context_provider),
       view_(view),
       surface_(surface),
       id_namespace_(id_namespace),
       next_local_id_(next_local_id),
       local_id_(0u) {
   capabilities_.delegated_rendering = true;
   capabilities_.max_frames_pending = 1;
 }
 
 OutputSurfaceImpl::~OutputSurfaceImpl() {
@@ skipping 90 matching lines @@
     (*view_map)[view_manager]->Init();
   }
   return (*view_map)[view_manager];
 }
 
 scoped_ptr<cc::OutputSurface>
 SurfaceBinding::PerViewManagerState::CreateOutputSurface(mojo::View* view) {
   // TODO(sky): figure out lifetime here. Do I need to worry about the return
   // value outliving this?
   mojo::CommandBufferPtr cb;
+  mojo::CommandBufferPtr worker_cb;
   gpu_->CreateOffscreenGLES2Context(GetProxy(&cb));
+  gpu_->CreateOffscreenGLES2Context(GetProxy(&worker_cb));
   scoped_refptr<cc::ContextProvider> context_provider(
       new mojo::ContextProviderMojo(cb.PassInterface().PassHandle()));
+  scoped_refptr<cc::ContextProvider> worker_context_provider(
+      new mojo::ContextProviderMojo(worker_cb.PassInterface().PassHandle()));
   return make_scoped_ptr(new OutputSurfaceImpl(
-      view, context_provider, surface_.get(), id_namespace_, &next_local_id_));
+      view, context_provider, worker_context_provider, surface_.get(),
+      id_namespace_, &next_local_id_));
 }
 
 SurfaceBinding::PerViewManagerState::PerViewManagerState(
     mojo::Shell* shell,
     mojo::ViewManager* view_manager)
     : shell_(shell),
       view_manager_(view_manager),
       returner_binding_(this),
       id_namespace_(0u),
       next_local_id_(0u) {
@@ skipping 60 matching lines @@
 }
 
 SurfaceBinding::~SurfaceBinding() {
 }
 
 scoped_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_->CreateOutputSurface(view_);
 }
 
 }  // namespace mandoline