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

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: nick's nits 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3ff2c4d37f4922fe102f61eef166b21f8472a8ce..3eba81bec23b8213202e4128e446c3542432caa8 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1641,8 +1641,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);
@@ -1656,8 +1658,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();
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698