1 files changed, 5 insertions, 25 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 3ddf4b3d6..8bda737da 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -54,9 +54,7 @@
 #include "qwebenginepage.h"
 
 #include "qwebenginecallback_p.h"
-#include "qwebenginecontextmenudata.h"
 #include "qwebenginescriptcollection.h"
-#include "render_view_context_menu_qt.h"
 #include "web_contents_adapter_client.h"
 
 #include <QtCore/qcompilerdetection.h>
@@ -106,7 +104,7 @@ public:
     QColor backgroundColor() const override;
     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
     void loadCommitted() override { }
-    void loadVisuallyCommitted() override { }
+    void didFirstVisuallyNonEmptyPaint() override { }
     void loadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString()) override;
     void focusContainer() override;
     void unhandledKeyEvent(QKeyEvent *event) override;
@@ -117,7 +115,7 @@ public:
     bool isBeingAdopted() override;
     void close() override;
     void windowCloseRejected() override;
-    void contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &data) override;
+    void contextMenuRequested(QWebEngineContextMenuRequest *request) override;
     void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) override;
     void requestFullScreenMode(const QUrl &origin, bool fullscreen) override;
     bool isFullScreenMode() const override;
@@ -140,8 +138,9 @@ public:
     void runRegisterProtocolHandlerRequest(QWebEngineRegisterProtocolHandlerRequest) override;
     QObject *accessibilityParentObject() override;
     QtWebEngineCore::WebEngineSettings *webEngineSettings() const override;
-    void allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) override;
-    void selectClientCert(const QSharedPointer<ClientCertSelectController> &controller) override;
+    void allowCertificateError(const QWebEngineCertificateError &error) override;
+    void selectClientCert(
+            const QSharedPointer<QtWebEngineCore::ClientCertSelectController> &controller) override;
     void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode) override;
     void requestGeometryChange(const QRect &geometry, const QRect &frameGeometry) override;
     void updateScrollPosition(const QPointF &position) override;
@@ -184,7 +183,6 @@ public:
     QWebEngineSettings *settings;
     QWebEngineView *view;
     QUrl url;
-    QWebEngineContextMenuData contextData;
     bool isLoading;
     QWebEngineScriptCollection scriptCollection;
     bool m_isBeingAdopted;
@@ -206,24 +204,6 @@ public:
 #if QT_CONFIG(webengine_printing_and_pdf)
     QPrinter *currentPrinter;
 #endif
-
-    QList<QSharedPointer<CertificateErrorController>> m_certificateErrorControllers;
-};
-
-class QContextMenuBuilder : public QtWebEngineCore::RenderViewContextMenuQt
-{
-public:
-    QContextMenuBuilder(const QtWebEngineCore::WebEngineContextMenuData &data, QWebEnginePage *page, QMenu *menu);
-
-private:
-    virtual bool hasInspector() override;
-    virtual bool isFullScreenMode() override;
-
-    virtual void addMenuItem(ContextMenuItem entry) override;
-    virtual bool isMenuItemEnabled(ContextMenuItem entry) override;
-
-    QWebEnginePage *m_page;
-    QMenu *m_menu;
 };
 
 QT_END_NAMESPACE