Fix tab focus in the widgets and QML webviews

Fixes:
- Make sure that we call SetInitialFocus when giving focus through Tab
  This does the same as would WebContents::FocusThroughTabTraversal
- Implement QWebEnginePagePrivate::passOnFocus
- Set each new RWHVQtDelegate as the focus proxy of the QWebEngineView
- Make sure that the widgets delegate accepts the tab focus policy

Cleaups:
- RenderWidgetHostViewQtDelegateQuick doesn't need to be a focus scope,
  it doesn't have any children
- We don't need to reimplement QQuickWebEngineView::forceActiveFocus
  since the view is now a focus scope
- Do not explicitly setFocus(true) on the QQuickWebEngineView,
  the application should decide this through the API

Change-Id: I817dc2c895d4fff4aa3536c71ecc5d306bb3bee0
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

3 files changed, 0 insertions, 13 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index cfbfe04e7..3fbd53d34 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -469,7 +469,6 @@ QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
     Q_D(QQuickWebEngineView);
     d->e->q_ptr = this;
     d->adapter->initialize(d);
-    this->setFocus(true);
     this->setActiveFocusOnTab(true);
     this->setFlag(QQuickItem::ItemIsFocusScope);
 
@@ -570,16 +569,6 @@ bool QQuickWebEngineView::canGoForward() const
     return d->adapter->canGoForward();
 }
 
-void QQuickWebEngineView::forceActiveFocus()
-{
-    Q_FOREACH (QQuickItem *child, childItems()) {
-        if (qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child)) {
-            child->forceActiveFocus();
-            break;
-        }
-    }
-}
-
 QQuickWebEngineViewExperimental *QQuickWebEngineView::experimental() const
 {
     Q_D(const QQuickWebEngineView);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index ca2574e0e..c03f1ec59 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -77,7 +77,6 @@ public:
     QString title() const;
     bool canGoBack() const;
     bool canGoForward() const;
-    void forceActiveFocus();
 
     QQuickWebEngineViewExperimental *experimental() const;
 
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 42bed96f6..26afda08f 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -61,7 +61,6 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW
         return;
     setFocus(true);
     setActiveFocusOnTab(true);
-    setFlag(QQuickItem::ItemIsFocusScope);
 }
 
 void RenderWidgetHostViewQtDelegateQuick::initAsChild(WebContentsAdapterClient* container)