Register surface namespace in BlimpUiContextFactory

ui/views/mus/surface_context_factory.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 "ui/views/mus/surface_context_factory.h"
 
 #include "cc/output/output_surface.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
+#include "cc/surfaces/surface_manager.h"
 #include "components/mus/public/cpp/window.h"
 #include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "ui/compositor/reflector.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace views {
 namespace {
 
 class FakeReflector : public ui::Reflector {
  public:
   FakeReflector() {}
   ~FakeReflector() override {}
   void OnMirroringCompositorResized() override {}
   void AddMirroringLayer(ui::Layer* layer) override {}
   void RemoveMirroringLayer(ui::Layer* layer) override {}
 };
 
 }  // namespace
 
 SurfaceContextFactory::SurfaceContextFactory(
     mojo::Connector* connector,
     mus::Window* window,
     mus::mojom::SurfaceType surface_type)
     : surface_binding_(connector, window, surface_type),
-      next_surface_id_namespace_(1u) {}
+      next_surface_id_namespace_(1u),
+      surface_manager_(new cc::SurfaceManager) {}
 
 SurfaceContextFactory::~SurfaceContextFactory() {}
 
 void SurfaceContextFactory::CreateOutputSurface(
     base::WeakPtr<ui::Compositor> compositor) {
   // NOTIMPLEMENTED();
   compositor->SetOutputSurface(surface_binding_.CreateOutputSurface());
 }
 
 scoped_ptr<ui::Reflector> SurfaceContextFactory::CreateReflector(
@@ skipping 34 matching lines @@
 
 gpu::GpuMemoryBufferManager*
 SurfaceContextFactory::GetGpuMemoryBufferManager() {
   return &gpu_memory_buffer_manager_;
 }
 
 cc::TaskGraphRunner* SurfaceContextFactory::GetTaskGraphRunner() {
   return raster_thread_helper_.task_graph_runner();
 }
 
+cc::SurfaceManager* SurfaceContextFactory::GetSurfaceManager() {
+  return surface_manager_.get();
+}
+
 scoped_ptr<cc::SurfaceIdAllocator>
 SurfaceContextFactory::CreateSurfaceIdAllocator() {
-  return make_scoped_ptr(
-      new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
+  scoped_ptr<cc::SurfaceIdAllocator> allocator =
+      make_scoped_ptr(new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
+  allocator->RegisterSurfaceIdNamespace(surface_manager_.get());
+  return allocator;
 }
 
 void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                           const gfx::Size& size) {
   // NOTIMPLEMENTED();
 }
 
 }  // namespace views