commit 85a4cef354c4ae0f4277af6bf6be82b3326f0c55
author avi <avi@chromium.org> Fri Dec 18 20:13:37 2015
committer Commit bot <commit-bot@chromium.org> Fri Dec 18 20:14:18 2015
tree c306619708e6d32b1e38dc4506bd858fa94bf825
parent 9de8ad81c88e8f82afb072204852d4cd61fa4814

Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

BUG=542477, 404828
TEST=all green
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_chromium_asan_rel_ng

Review URL: https://codereview.chromium.org/1453803002

Cr-Commit-Position: refs/heads/master@{#366156}

content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 366b9595..39cc6cd 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1642,8 +1642,10 @@
   // This method is being called to enter renderer-initiated fullscreen mode.
   // Make sure any existing fullscreen widget is shut down first.
   RenderWidgetHostView* const widget_view = GetFullscreenRenderWidgetHostView();
-  if (widget_view)
-    RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())->Shutdown();
+  if (widget_view) {
+    RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())
+        ->ShutdownAndDestroyWidget(true);
+  }
 
   if (delegate_)
     delegate_->EnterFullscreenModeForTab(this, origin);
@@ -1657,8 +1659,10 @@
   // This method is being called to leave renderer-initiated fullscreen mode.
   // Make sure any existing fullscreen widget is shut down first.
   RenderWidgetHostView* const widget_view = GetFullscreenRenderWidgetHostView();
-  if (widget_view)
-    RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())->Shutdown();
+  if (widget_view) {
+    RenderWidgetHostImpl::From(widget_view->GetRenderWidgetHost())
+        ->ShutdownAndDestroyWidget(true);
+  }
 
 #if defined(OS_ANDROID)
   ContentVideoView* video_view = ContentVideoView::GetInstance();