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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.h

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
Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index c64ef6e036e7d762930b0b25436b2a03ef21186a..202ff7460d765d5253c2f4a8e53719fb852d8556 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -132,7 +132,12 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
touch_editing_client_ = client;
}
- explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
+ // When |is_guest_view_hack| is true, this view isn't really the view for
+ // the |widget|, a RenderWidgetHostViewGuest is.
+ //
+ // TODO(lazyboy): Remove |is_guest_view_hack| once BrowserPlugin has migrated
+ // to use RWHVChildFrame (http://crbug.com/330264).
+ RenderWidgetHostViewAura(RenderWidgetHost* host, bool is_guest_view_hack);
// RenderWidgetHostView implementation.
virtual void InitAsChild(gfx::NativeView parent_view) override;
@@ -617,6 +622,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
+ // True when this view acts as a platform view hack for a
+ // RenderWidgetHostViewGuest.
+ bool is_guest_view_hack_;
+
base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
gfx::Rect disambiguation_target_rect_;

Powered by Google App Engine
This is Rietveld 408576698