Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(509)

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1453803002: Separate RenderViewHost from RenderWidgetHost, part 10: shutdown. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: all in destroy, plus mac Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: 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 05229a81c6dec759070bb41251bedcc46a1b6073..788fe5e612290b771b176d014971de28ad35f1c8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1630,8 +1630,10 @@ void WebContentsImpl::EnterFullscreenMode(const GURL& origin) {
// 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);
@@ -1645,8 +1647,10 @@ void WebContentsImpl::ExitFullscreenMode() {
// 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();

Powered by Google App Engine
This is Rietveld 408576698