Create a RWHV delegate in core

This is adapting the Quick code for shared use with widgets,
and allows us to use it from QWebEnginePage.

Pick-to: 6.4
Fixes: QTBUG-96377
Change-Id: I3f09c1a949eff86d80fbe6c513dc66e3f9f2f611
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 5 insertions, 25 deletions

diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h
index 2096f79c6..fe9f78322 100644
--- a/src/webenginequick/api/qquickwebengineview_p_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p_p.h
@@ -66,7 +66,7 @@
 #include <QtGui/qaccessibleobject.h>
 
 namespace QtWebEngineCore {
-class RenderWidgetHostViewQtDelegateQuick;
+class RenderWidgetHostViewQtDelegateItem;
 class TouchSelectionMenuController;
 class UIDelegatesManager;
 class WebContentsAdapter;
@@ -174,9 +174,9 @@ public:
     void ensureContentsAdapter();
     void setFullScreenMode(bool);
 
-    static void bindViewAndWidget(QQuickWebEngineView *view, QtWebEngineCore::RenderWidgetHostViewQtDelegateQuick *widget);
-    void widgetChanged(QtWebEngineCore::RenderWidgetHostViewQtDelegateQuick *oldWidget,
-                       QtWebEngineCore::RenderWidgetHostViewQtDelegateQuick *newWidget);
+    static void bindViewAndWidget(QQuickWebEngineView *view, QtWebEngineCore::RenderWidgetHostViewQtDelegateItem *widget);
+    void widgetChanged(QtWebEngineCore::RenderWidgetHostViewQtDelegateItem *oldWidget,
+                       QtWebEngineCore::RenderWidgetHostViewQtDelegateItem *newWidget);
 
     QQuickWebEngineProfile *m_profile;
     QSharedPointer<QtWebEngineCore::WebContentsAdapter> adapter;
@@ -200,7 +200,7 @@ public:
     bool m_defaultAudioMuted;
     bool m_isBeingAdopted;
     mutable QQuickWebEngineAction *actions[QQuickWebEngineView::WebActionCount];
-    QtWebEngineCore::RenderWidgetHostViewQtDelegateQuick *widget = nullptr;
+    QtWebEngineCore::RenderWidgetHostViewQtDelegateItem *widget = nullptr;
 
     bool profileInitialized() const;
     QQuickWebEngineScriptCollection *getUserScripts();
@@ -216,26 +216,6 @@ private:
     QQmlComponent *m_touchHandleDelegate;
 };
 
-#ifndef QT_NO_ACCESSIBILITY
-class QQuickWebEngineViewAccessible : public QAccessibleObject
-{
-public:
-    QQuickWebEngineViewAccessible(QQuickWebEngineView *o);
-    bool isValid() const override;
-    QAccessibleInterface *parent() const override;
-    QAccessibleInterface *focusChild() const override;
-    int childCount() const override;
-    QAccessibleInterface *child(int index) const override;
-    int indexOfChild(const QAccessibleInterface*) const override;
-    QString text(QAccessible::Text) const override;
-    QAccessible::Role role() const override;
-    QAccessible::State state() const override;
-
-private:
-    QQuickWebEngineView *engineView() const { return static_cast<QQuickWebEngineView*>(object()); }
-};
-#endif // QT_NO_ACCESSIBILITY
-
 class QQuickContextMenuBuilder : public QtWebEngineCore::RenderViewContextMenuQt
 {
 public: