Fix destruction order between SurfaceManger and OffscreenCanvasSurfaceImpl

content/browser/renderer_host/offscreen_canvas_surface_impl.cc

Index: content/browser/renderer_host/offscreen_canvas_surface_impl.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
index edbed1acad500d6efd8bbfec98f50754cfea202f..b9ada9498f928bc03d286242974c20c0c1070e7a 100644
--- a/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
+++ b/content/browser/renderer_host/offscreen_canvas_surface_impl.cc
@@ -25,15 +25,22 @@ OffscreenCanvasSurfaceImpl::OffscreenCanvasSurfaceImpl(
       binding_(this, std::move(request)) {}
 
 OffscreenCanvasSurfaceImpl::~OffscreenCanvasSurfaceImpl() {
+  if (!GetSurfaceManager()) {
+    // Inform both members that SurfaceManager's no longer alive to
+    // avoid their destruction errors.
+    surface_factory_->didDestroySurfaceManager();
+    id_allocator_->didDestroySurfaceManager();
+  }
+  surface_factory_->Destroy(surface_id_);
 }
 
 void OffscreenCanvasSurfaceImpl::GetSurfaceId(
     const GetSurfaceIdCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  cc::SurfaceId surface_id = id_allocator_->GenerateId();
+  surface_id_ = id_allocator_->GenerateId();
 
-  callback.Run(surface_id);
+  callback.Run(surface_id_);
 }
 
 void OffscreenCanvasSurfaceImpl::RequestSurfaceCreation(