Fix destruction order between SurfaceManger and OffscreenCanvasSurfaceImpl

content/browser/renderer_host/offscreen_canvas_surface_impl.cc

 // Copyright 2016 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 "content/browser/renderer_host/offscreen_canvas_surface_impl.h"
 
 #include "base/bind_helpers.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/public/browser/browser_thread.h"
+#include <iostream>
 
 namespace content {
 
 // static
 void OffscreenCanvasSurfaceImpl::Create(
     mojo::InterfaceRequest<blink::mojom::OffscreenCanvasSurface> request) {
   // |binding_| will take ownership of OffscreenCanvasSurfaceImpl
   new OffscreenCanvasSurfaceImpl(std::move(request));
 }
 
 OffscreenCanvasSurfaceImpl::OffscreenCanvasSurfaceImpl(
     mojo::InterfaceRequest<blink::mojom::OffscreenCanvasSurface> request)
     : id_allocator_(CreateSurfaceIdAllocator()),
       binding_(this, std::move(request)) {}
 
 OffscreenCanvasSurfaceImpl::~OffscreenCanvasSurfaceImpl() {
+    if (!GetSurfaceManager()) {

[Justin Novosad, 2016/06/22 20:47:09]

Is is not possible to call GetSurfaceManager in SurfaceFactory?  Would be nice
to just get rid of SurfaceFactory::manager_

[xlai (Olivia), 2016/06/23 14:49:38]

Cannot...cc/ folder cannot import things from content/...

+        std::cout << "surface manager no longer exists! " << std::endl;
+        surface_factory_->onSurfaceManagerDestroyed();
+    }
+    surface_factory_.reset();
+    //surface_factory_->DestroyAll();
 }
 
 void OffscreenCanvasSurfaceImpl::GetSurfaceId(
     const GetSurfaceIdCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   cc::SurfaceId surface_id = id_allocator_->GenerateId();
 
   callback.Run(surface_id);
 }
@@ skipping 31 matching lines @@
     const cc::ReturnedResourceArray& resources) {}
 
 void OffscreenCanvasSurfaceImpl::WillDrawSurface(cc::SurfaceId id,
                                                  const gfx::Rect& damage_rect) {
 }
 
 void OffscreenCanvasSurfaceImpl::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {}
 
 }  // namespace content