Don't destroy RenderWidgetCompositor during DoDeferredClose

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index b0b4e8f94021b8763abc38e6386307363357f5c5..ca7cad835a60ce4968a5eb6b62076285abbe9b02 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1219,14 +1219,6 @@ void RenderWidget::initializeLayerTreeView() {
     StartCompositor();
 }
 
-void RenderWidget::DestroyLayerTreeView() {
-  // Always send this notification to prevent new layer tree views from
-  // being created, even if one hasn't been created yet.
-  if (webwidget_)
-    webwidget_->willCloseLayerTreeView();
-  compositor_.reset();
-}
-
 blink::WebLayerTreeView* RenderWidget::layerTreeView() {
   return compositor_.get();
 }
@@ -1390,10 +1382,7 @@ void RenderWidget::didBlur() {
 }
 
 void RenderWidget::DoDeferredClose() {
-  // No more compositing is possible.  This prevents shutdown races between
-  // previously posted CreateOutputSurface tasks and the host being unable to
-  // create them because the close message was handled.
-  DestroyLayerTreeView();
+  StopCompositor();
   // Also prevent new compositors from being created.
   host_closing_ = true;
   Send(new ViewHostMsg_Close(routing_id_));
@@ -1435,7 +1424,7 @@ void RenderWidget::QueueSyntheticGesture(
 
 void RenderWidget::Close() {
   screen_metrics_emulator_.reset();
-  DestroyLayerTreeView();
+  StopCompositor();
   if (webwidget_) {
     webwidget_->close();
     webwidget_ = NULL;
@@ -2004,6 +1993,15 @@ void RenderWidget::StartCompositor() {
   compositor_->setSurfaceReady();
 }
 
+void RenderWidget::StopCompositor() {
+  // Always send this notification to prevent new layer tree views from
+  // being created, even if one hasn't been created yet.
+  if (webwidget_)
+    webwidget_->willCloseLayerTreeView();
+  if (compositor_)
+    compositor_->Shutdown();
+}
+
 void RenderWidget::SchedulePluginMove(const WebPluginGeometry& move) {
   size_t i = 0;
   for (; i < plugin_window_moves_.size(); ++i) {