From 2ee75c4411394981f5bbf50c0edffe42b6343c90 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 8 Aug 2013 14:10:46 +0200 Subject: Simplify the ownership between RWHVQt and RWHVQtDelegate. Let the RWHVQt explicitly own its delegate. Keep the same behavior by letting RWHVQt::Destroy delete itself directly like done in RWHVGtk instead of deleting the RWHVDelegate which would then delete its RWHV. Change-Id: I051c95d608964ebcd66d3ccbe728f63c0ca397ae Reviewed-by: Zeno Albisser --- lib/render_widget_host_view_qt.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/render_widget_host_view_qt.cpp') diff --git a/lib/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp index 30670ffcd..d3a22f5cc 100644 --- a/lib/render_widget_host_view_qt.cpp +++ b/lib/render_widget_host_view_qt.cpp @@ -109,6 +109,7 @@ RenderWidgetHostViewQt::~RenderWidgetHostViewQt() void RenderWidgetHostViewQt::SetDelegate(RenderWidgetHostViewQtDelegate* delegate) { m_delegate.reset(delegate); + delegate->setView(this); } bool RenderWidgetHostViewQt::handleEvent(QEvent* event) { @@ -461,7 +462,7 @@ void RenderWidgetHostViewQt::RenderProcessGone(base::TerminationStatus, int) void RenderWidgetHostViewQt::Destroy() { - m_delegate.reset(); + delete this; } void RenderWidgetHostViewQt::SetTooltipText(const string16&) -- cgit v1.2.3