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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 647613002: Fix RenderWidgetHostViewGuest leak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add content_unittests 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
« content/browser/renderer_host/render_widget_host_view_aura.cc ('K') | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 9785c559e6bc2c4469af8ac1b63045aa6e3eb82e..e6e3a2100436d1902c30b8160ec16cf5428d8358 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -570,8 +570,10 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
// We are owned by RenderWidgetHostViewCocoa, so if we go away before the
// RenderWidgetHost does we need to tell it not to hold a stale pointer to
// us.
- if (render_widget_host_)
- render_widget_host_->SetView(NULL);
+ if (render_widget_host_) {
+ if (render_widget_host_->GetView() == this)
+ render_widget_host_->SetView(NULL);
+ }
}
void RenderWidgetHostViewMac::SetDelegate(
« content/browser/renderer_host/render_widget_host_view_aura.cc ('K') | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698