Fix destruction order between SurfaceManger and OffscreenCanvasSurfaceImpl

cc/surfaces/surface_factory.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 "cc/surfaces/surface_factory.h"
 
 #include <utility>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 14 matching lines @@
 
 SurfaceFactory::~SurfaceFactory() {
   if (!surface_map_.empty()) {
     LOG(ERROR) << "SurfaceFactory has " << surface_map_.size()
                << " entries in map on destruction.";
   }
   DestroyAll();
 }
 
 void SurfaceFactory::DestroyAll() {
-  for (auto& pair : surface_map_)
-    manager_->Destroy(std::move(pair.second));
+  if (manager_) {
+    for (auto& pair : surface_map_)
+      manager_->Destroy(std::move(pair.second));
+  }
   surface_map_.clear();
 }
 
 void SurfaceFactory::Create(SurfaceId surface_id) {
   std::unique_ptr<Surface> surface(new Surface(surface_id, this));
   manager_->RegisterSurface(surface.get());
   DCHECK(!surface_map_.count(surface_id));
   surface_map_[surface_id] = std::move(surface);
 }
 
 void SurfaceFactory::Destroy(SurfaceId surface_id) {
   OwningSurfaceMap::iterator it = surface_map_.find(surface_id);
   DCHECK(it != surface_map_.end());
   DCHECK(it->second->factory().get() == this);
   std::unique_ptr<Surface> surface(std::move(it->second));
   surface_map_.erase(it);
-  manager_->Destroy(std::move(surface));
+  if (manager_)
+    manager_->Destroy(std::move(surface));
 }
 
 void SurfaceFactory::SetPreviousFrameSurface(SurfaceId new_id,
                                              SurfaceId old_id) {
   OwningSurfaceMap::iterator it = surface_map_.find(new_id);
   DCHECK(it != surface_map_.end());
   Surface* old_surface = manager_->GetSurfaceForId(old_id);
   if (old_surface) {
     it->second->SetPreviousFrameSurface(old_surface);
   }
@@ skipping 47 matching lines @@
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
   holder_.UnrefResources(resources);
 }
 
 }  // namespace cc