Register surface namespace in BlimpUiContextFactory

blimp/engine/app/ui/blimp_ui_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 "blimp/engine/app/ui/blimp_ui_context_factory.h"
 
 #include "cc/output/output_surface.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "cc/surfaces/surface_id_allocator.h"
+#include "content/browser/compositor/image_transport_factory.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/compositor/reflector.h"
 
 namespace blimp {
 namespace engine {
 
 BlimpUiContextFactory::BlimpUiContextFactory()
     : next_surface_id_namespace_(1u) {}
 
 BlimpUiContextFactory::~BlimpUiContextFactory() {}
@@ skipping 43 matching lines @@
 BlimpUiContextFactory::GetGpuMemoryBufferManager() {
   return nullptr;
 }
 
 cc::TaskGraphRunner* BlimpUiContextFactory::GetTaskGraphRunner() {
   return &task_graph_runner_;
 }
 
 scoped_ptr<cc::SurfaceIdAllocator>
 BlimpUiContextFactory::CreateSurfaceIdAllocator() {
-  return make_scoped_ptr(
+  scoped_ptr<cc::SurfaceIdAllocator> allocator(
       new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
+  content::ImageTransportFactory* factory =
+      content::ImageTransportFactory::GetInstance();
+  if (factory->GetSurfaceManager())
+    allocator->RegisterSurfaceIdNamespace(factory->GetSurfaceManager());
+  return allocator;
 }
 
 void BlimpUiContextFactory::ResizeDisplay(ui::Compositor* compositor,
                                           const gfx::Size& size) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace engine
 }  // namespace blimp