| Index: mojo/aura/context_factory_mojo.cc
|
| diff --git a/mojo/aura/context_factory_mojo.cc b/mojo/aura/context_factory_mojo.cc
|
| index 5b55cba9374b861b4b9585537ab65ae621c7e58d..eb9d91b567815e1ac9abf81060fb54cdd722102e 100644
|
| --- a/mojo/aura/context_factory_mojo.cc
|
| +++ b/mojo/aura/context_factory_mojo.cc
|
| @@ -9,6 +9,7 @@
|
| #include "cc/output/output_surface.h"
|
| #include "cc/output/software_output_device.h"
|
| #include "cc/resources/shared_bitmap_manager.h"
|
| +#include "cc/surfaces/surface_id_allocator.h"
|
| #include "mojo/aura/window_tree_host_mojo.h"
|
| #include "skia/ext/platform_canvas.h"
|
| #include "ui/compositor/reflector.h"
|
| @@ -94,7 +95,8 @@ class TestSharedBitmapManager : public cc::SharedBitmapManager {
|
| } // namespace
|
|
|
| ContextFactoryMojo::ContextFactoryMojo()
|
| - : shared_bitmap_manager_(new TestSharedBitmapManager()) {
|
| + : shared_bitmap_manager_(new TestSharedBitmapManager()),
|
| + next_surface_id_namespace_(1u) {
|
| }
|
|
|
| ContextFactoryMojo::~ContextFactoryMojo() {}
|
| @@ -134,4 +136,10 @@ base::MessageLoopProxy* ContextFactoryMojo::GetCompositorMessageLoop() {
|
| return NULL;
|
| }
|
|
|
| +scoped_ptr<cc::SurfaceIdAllocator>
|
| +ContextFactoryMojo::CreateSurfaceIdAllocator() {
|
| + return make_scoped_ptr(
|
| + new cc::SurfaceIdAllocator(next_surface_id_namespace_++));
|
| +}
|
| +
|
| } // namespace mojo
|
|
|