| Index: blimp/engine/app/ui/blimp_ui_context_factory.cc
|
| diff --git a/blimp/engine/app/ui/blimp_ui_context_factory.cc b/blimp/engine/app/ui/blimp_ui_context_factory.cc
|
| index d41150a294d2abfa85a610a1a97effe1f4cbb362..43d751bff5a13edd68624af8b5ac3acc8f1a36d9 100644
|
| --- a/blimp/engine/app/ui/blimp_ui_context_factory.cc
|
| +++ b/blimp/engine/app/ui/blimp_ui_context_factory.cc
|
| @@ -14,7 +14,8 @@ namespace blimp {
|
| namespace engine {
|
|
|
| BlimpUiContextFactory::BlimpUiContextFactory()
|
| - : next_surface_id_namespace_(1u) {}
|
| + : next_surface_id_namespace_(1u),
|
| + surface_manager_(new cc::SurfaceManager) {}
|
|
|
| BlimpUiContextFactory::~BlimpUiContextFactory() {}
|
|
|
| @@ -68,10 +69,16 @@ cc::TaskGraphRunner* BlimpUiContextFactory::GetTaskGraphRunner() {
|
| return &task_graph_runner_;
|
| }
|
|
|
| +cc::SurfaceManager* GetSurfaceManager() {
|
| + return surface_manager_.get();
|
| +}
|
| +
|
| scoped_ptr<cc::SurfaceIdAllocator>
|
| BlimpUiContextFactory::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 BlimpUiContextFactory::ResizeDisplay(ui::Compositor* compositor,
|
|
|