Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot

1 files changed, 18 insertions, 33 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtDialogRunner.h b/Source/WebKit2/UIProcess/qt/QtDialogRunner.h
index eb229ec84..c04043d34 100644
--- a/Source/WebKit2/UIProcess/qt/QtDialogRunner.h
+++ b/Source/WebKit2/UIProcess/qt/QtDialogRunner.h
@@ -22,6 +22,7 @@
 #define QtDialogRunner_h
 
 #include "WKSecurityOrigin.h"
+#include "qquickwebview_p.h"
 #include <QtCore/QEventLoop>
 #include <QtCore/QStringList>
 #include <wtf/OwnPtr.h>
@@ -38,17 +39,19 @@ class QtDialogRunner : public QEventLoop {
     Q_OBJECT
 
 public:
-    QtDialogRunner();
+    QtDialogRunner(QQuickWebView*);
     virtual ~QtDialogRunner();
 
-    bool initForAlert(QQmlComponent*, QQuickItem* dialogParent, const QString& message);
-    bool initForConfirm(QQmlComponent*, QQuickItem* dialogParent, const QString& message);
-    bool initForPrompt(QQmlComponent*, QQuickItem* dialogParent, const QString& message, const QString& defaultValue);
-    bool initForAuthentication(QQmlComponent*, QQuickItem* dialogParent, const QString& hostname, const QString& realm, const QString& prefilledUsername);
-    bool initForCertificateVerification(QQmlComponent*, QQuickItem*, const QString& hostname);
-    bool initForProxyAuthentication(QQmlComponent*, QQuickItem*, const QString& hostname, uint16_t port, const QString& prefilledUsername);
-    bool initForFilePicker(QQmlComponent*, QQuickItem*, const QStringList& selectedFiles, bool allowMultiple);
-    bool initForDatabaseQuotaDialog(QQmlComponent*, QQuickItem*, const QString& databaseName, const QString& displayName, WKSecurityOriginRef, quint64 currentQuota, quint64 currentOriginUsage, quint64 currentDatabaseUsage, quint64 expectedUsage);
+    bool initForAlert(const QString& message);
+    bool initForConfirm(const QString& message);
+    bool initForPrompt(const QString& message, const QString& defaultValue);
+    bool initForAuthentication(const QString& hostname, const QString& realm, const QString& prefilledUsername);
+    bool initForCertificateVerification(const QString& hostname);
+    bool initForProxyAuthentication(const QString& hostname, uint16_t port, const QString& prefilledUsername);
+    bool initForFilePicker(const QStringList& selectedFiles, bool allowMultiple);
+    bool initForDatabaseQuotaDialog(const QString& databaseName, const QString& displayName, WKSecurityOriginRef, quint64 currentQuota, quint64 currentOriginUsage, quint64 currentDatabaseUsage, quint64 expectedUsage);
+
+    void run();
 
     QQuickItem* dialog() const { return m_dialog.get(); }
 
@@ -63,33 +66,15 @@ public:
     QStringList filePaths() const { return m_filepaths; }
 
 public slots:
-    void onAccepted(const QString& result = QString())
-    {
-        m_wasAccepted = true;
-        m_result = result;
-    }
-
-    void onAuthenticationAccepted(const QString& username, const QString& password)
-    {
-        m_username = username;
-        m_password = password;
-    }
-
-    void onFileSelected(const QStringList& filePaths)
-    {
-        m_wasAccepted = true;
-        m_filepaths = filePaths;
-    }
-
-    void onDatabaseQuotaAccepted(quint64 quota)
-    {
-        m_wasAccepted = true;
-        m_databaseQuota = quota;
-    }
+    void onAccepted(const QString& result = QString());
+    void onAuthenticationAccepted(const QString& username, const QString& password);
+    void onFileSelected(const QStringList& filePaths);
+    void onDatabaseQuotaAccepted(quint64 quota);
 
 private:
-    bool createDialog(QQmlComponent*, QQuickItem* dialogParent, QObject* contextObject);
+    bool createDialog(QQmlComponent*, QObject* contextObject);
 
+    QQuickWebView* m_webView;
     OwnPtr<QQmlContext> m_dialogContext;
     OwnPtr<QQuickItem> m_dialog;
     QString m_result;