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

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: no dcheck for now Created 5 years 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 f78597e44770a06d73d3d37fcc620d40a94b7a7b..44c9abf33a051e237dbecac66c4c8fe810ad2038 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1655,8 +1655,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);
@@ -1670,8 +1672,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