From 80ead68ca80bca4f33e824064bff5af3b939a803 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 8 Aug 2013 13:56:38 +0200 Subject: Avoid keeping a RWHVDelegate pointer in WebContentsViewQt. There can be multiple RWHVDelegates within one WebContentsViewQt during navigation. Avoid keeping a pointer by sending the focus call to the client directly, which fits the purpose better. Change-Id: I863c174e9a2567f3580f3cb525bc5353ab2a4417 Reviewed-by: Zeno Albisser --- lib/web_contents_view_qt.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/web_contents_view_qt.cpp') diff --git a/lib/web_contents_view_qt.cpp b/lib/web_contents_view_qt.cpp index 9d35b622f..7903d24fe 100644 --- a/lib/web_contents_view_qt.cpp +++ b/lib/web_contents_view_qt.cpp @@ -50,9 +50,9 @@ content::RenderWidgetHostView* WebContentsViewQt::CreateViewForWidget(content::RenderWidgetHost* render_widget_host) { RenderWidgetHostViewQt *view = new RenderWidgetHostViewQt(render_widget_host); - m_viewDelegate = m_client->CreateRenderWidgetHostViewQtDelegate(); - m_viewDelegate->resetView(view); - view->SetDelegate(m_viewDelegate); + RenderWidgetHostViewQtDelegate* viewDelegate = m_client->CreateRenderWidgetHostViewQtDelegate(); + viewDelegate->resetView(view); + view->SetDelegate(viewDelegate); return view; } @@ -71,7 +71,7 @@ void WebContentsViewQt::GetContainerBounds(gfx::Rect* out) const void WebContentsViewQt::Focus() { - m_viewDelegate->setKeyboardFocus(); + m_client->focusContainer(); } void WebContentsViewQt::SetInitialFocus() -- cgit v1.2.1