From 84ced937a0f9f2874e32e16c4c6ebf72b46904c9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Mon, 7 Apr 2014 14:00:35 +0200 Subject: Replace uses of QWebEngineFrame with a security origin URL This changes implemented methods. The rest of the references will go away with the public headers cleanup. Change-Id: I82340cd7a4488c4b463489ae98cd9c16de4e7487 Reviewed-by: Michael Bruning --- src/webenginewidgets/api/qwebenginepage.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/webenginewidgets/api/qwebenginepage.h') diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index eea7b52d2..29ba140bc 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -574,9 +574,9 @@ protected: virtual bool acceptNavigationRequest(QWebEngineFrame *frame, const QNetworkRequest &request, NavigationType type) { Q_UNUSED(frame); Q_UNUSED(&request); Q_UNUSED(type); Q_UNREACHABLE(); return false; } virtual QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes); - virtual void javaScriptAlert(QWebEngineFrame *originatingFrame, const QString& msg); - virtual bool javaScriptConfirm(QWebEngineFrame *originatingFrame, const QString& msg); - virtual bool javaScriptPrompt(QWebEngineFrame *originatingFrame, const QString& msg, const QString& defaultValue, QString* result); + virtual void javaScriptAlert(const QUrl &securityOrigin, const QString& msg); + virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString& msg); + virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result); virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID); virtual QString userAgentForUrl(const QUrl& url) const { Q_UNUSED(url); Q_UNREACHABLE(); return QString(); } -- cgit v1.2.3