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

Unified Diff: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm

Issue 647613002: Fix RenderWidgetHostViewGuest leak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bring back mac delegate() 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
« no previous file with comments | « chrome/browser/apps/web_view_browsertest.cc ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index a1ea1e2a15ad2fd1b1454ad8374c7d02f94224ae..3f78f802df4fffbd25b6ce03f0ceb6fc245f2014 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -76,8 +76,12 @@ class SpellCheckObserver : public content::WebContentsObserver {
self = [super init];
if (self) {
renderWidgetHost_ = renderWidgetHost;
- NSView* nativeView = renderWidgetHost_->GetView()->GetNativeView();
- view_id_util::SetID(nativeView, VIEW_ID_TAB_CONTAINER);
+ // if |renderWidgetHost_| belongs to a BrowserPluginGuest, then it won't
+ // have a view yet.
+ if (renderWidgetHost_->GetView()) {
+ NSView* nativeView = renderWidgetHost_->GetView()->GetNativeView();
+ view_id_util::SetID(nativeView, VIEW_ID_TAB_CONTAINER);
+ }
if (renderWidgetHost_->IsRenderView()) {
spellingObserver_.reset(
« no previous file with comments | « chrome/browser/apps/web_view_browsertest.cc ('k') | content/browser/browser_plugin/browser_plugin_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698