diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-08-08 13:56:38 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-12 12:04:53 +0200 |
| commit | 80ead68ca80bca4f33e824064bff5af3b939a803 (patch) | |
| tree | 200257aa555eced28a29d9d7a3e6078f8e3dbef3 /lib/widgets | |
| parent | 08bfd6fb1595f4940316845348b5a262f55e7077 (diff) | |
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 <zeno.albisser@digia.com>
Diffstat (limited to 'lib/widgets')
| -rw-r--r-- | lib/widgets/Api/qwebcontentsview.cpp | 6 | ||||
| -rw-r--r-- | lib/widgets/Api/qwebcontentsview_p.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/widgets/Api/qwebcontentsview.cpp b/lib/widgets/Api/qwebcontentsview.cpp index 1479a17be..2ef4c04d4 100644 --- a/lib/widgets/Api/qwebcontentsview.cpp +++ b/lib/widgets/Api/qwebcontentsview.cpp @@ -88,6 +88,12 @@ void QWebContentsViewPrivate::loadFinished(bool success) Q_EMIT q->loadFinished(success); } +void QWebContentsViewPrivate::focusContainer() +{ + Q_Q(QWebContentsView); + q->setFocus(); +} + RenderWidgetHostViewQtDelegate *QWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate() { Q_Q(QWebContentsView); diff --git a/lib/widgets/Api/qwebcontentsview_p.h b/lib/widgets/Api/qwebcontentsview_p.h index eade6c245..d97a098d9 100644 --- a/lib/widgets/Api/qwebcontentsview_p.h +++ b/lib/widgets/Api/qwebcontentsview_p.h @@ -64,6 +64,7 @@ public: virtual void loadingStateChanged() Q_DECL_OVERRIDE; virtual QRectF viewportRect() const Q_DECL_OVERRIDE; virtual void loadFinished(bool success) Q_DECL_OVERRIDE; + virtual void focusContainer() Q_DECL_OVERRIDE; bool m_isLoading; QScopedPointer<WebContentsAdapter> adapter; |