Avoid destroying surface before the parent surface stops referencing it.

mojo/aura/context_factory_mojo.cc

 // Copyright 2014 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 "mojo/aura/context_factory_mojo.h"
 
 #include "base/bind.h"
 #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"
 
 namespace mojo {
 namespace {
 
 void FreeSharedBitmap(cc::SharedBitmap* shared_bitmap) {
   delete shared_bitmap->memory();
 }
@@ skipping 65 matching lines @@
  private:
   base::Lock lock_;
   std::map<cc::SharedBitmapId, base::SharedMemory*> bitmap_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSharedBitmapManager);
 };
 
 }  // namespace
 
 ContextFactoryMojo::ContextFactoryMojo()
-    : shared_bitmap_manager_(new TestSharedBitmapManager()) {
+    : shared_bitmap_manager_(new TestSharedBitmapManager()),
+      next_surface_id_namespace_(1u) {
 }
 
 ContextFactoryMojo::~ContextFactoryMojo() {}
 
 scoped_ptr<cc::OutputSurface> ContextFactoryMojo::CreateOutputSurface(
     ui::Compositor* compositor,
     bool software_fallback) {
   scoped_ptr<cc::SoftwareOutputDevice> output_device(
       new SoftwareOutputDeviceViewManager(compositor));
   return make_scoped_ptr(new cc::OutputSurface(output_device.Pass()));
@@ skipping 19 matching lines @@
 bool ContextFactoryMojo::DoesCreateTestContexts() { return false; }
 
 cc::SharedBitmapManager* ContextFactoryMojo::GetSharedBitmapManager() {
   return shared_bitmap_manager_.get();
 }
 
 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