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

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

Issue 647613002: Fix RenderWidgetHostViewGuest leak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add is_guest_view_hack_ to RWHV Created 6 years, 2 months 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_view_guest.cc
diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc
index 675cfae40f0e5f3563e0813db8b1e8a000cad62f..4b2059a233facd288719b4140432130916d09295 100644
--- a/content/browser/web_contents/web_contents_view_guest.cc
+++ b/content/browser/web_contents/web_contents_view_guest.cc
@@ -140,7 +140,7 @@ void WebContentsViewGuest::CreateView(const gfx::Size& initial_size,
}
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
- RenderWidgetHost* render_widget_host) {
+ RenderWidgetHost* render_widget_host, bool is_guest_view_hack) {
if (render_widget_host->GetView()) {
// During testing, the view will already be set up in most cases to the
// test view, so we don't want to clobber it with a real one. To verify that
@@ -153,16 +153,16 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
}
RenderWidgetHostViewBase* platform_widget =
- platform_view_->CreateViewForWidget(render_widget_host);
+ platform_view_->CreateViewForWidget(render_widget_host, true);
return new RenderWidgetHostViewGuest(render_widget_host,
guest_,
- platform_widget);
+ platform_widget->GetWeakPtr());
}
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget(
- RenderWidgetHost* render_widget_host) {
- return platform_view_->CreateViewForPopupWidget(render_widget_host);
+ RenderWidgetHost* render_widget_host, bool is_guest_view_hack) {
+ return platform_view_->CreateViewForPopupWidget(render_widget_host, true);
piman 2014/10/14 23:48:06 I don't think we should pass true. This is called
lazyboy 2014/10/15 04:50:11 Oh that's right, these views don't have a wrapped
}
void WebContentsViewGuest::SetPageTitle(const base::string16& title) {

Powered by Google App Engine
This is Rietveld 408576698