| 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..24da2edf38a90aadc4bc1f7e0eb845d361990bcf 100644
|
| --- a/blimp/engine/app/ui/blimp_ui_context_factory.cc
|
| +++ b/blimp/engine/app/ui/blimp_ui_context_factory.cc
|
| @@ -7,6 +7,7 @@
|
| #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"
|
|
|
| @@ -70,8 +71,13 @@ cc::TaskGraphRunner* BlimpUiContextFactory::GetTaskGraphRunner() {
|
|
|
| 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,
|
|
|