diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2016-09-28 16:39:37 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-02-02 12:31:01 +0000 |
| commit | 9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch) | |
| tree | 322337ad0acbc75732f916376ec6d36e7ec0e5bc /Source/WebKit2/UIProcess/qt/QtDialogRunner.h | |
| parent | 6882a04fb36642862b11efe514251d32070c3d65 (diff) | |
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtDialogRunner.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtDialogRunner.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtDialogRunner.h b/Source/WebKit2/UIProcess/qt/QtDialogRunner.h index b70044076..fcb276080 100644 --- a/Source/WebKit2/UIProcess/qt/QtDialogRunner.h +++ b/Source/WebKit2/UIProcess/qt/QtDialogRunner.h @@ -21,11 +21,10 @@ #ifndef QtDialogRunner_h #define QtDialogRunner_h -#include "WKSecurityOrigin.h" +#include "WKSecurityOriginRef.h" #include "qquickwebview_p.h" #include <QtCore/QEventLoop> #include <QtCore/QStringList> -#include <wtf/OwnPtr.h> QT_BEGIN_NAMESPACE class QQmlComponent; @@ -75,8 +74,8 @@ private: bool createDialog(QQmlComponent*, QObject* contextObject); QQuickWebView* m_webView; - OwnPtr<QQmlContext> m_dialogContext; - OwnPtr<QQuickItem> m_dialog; + std::unique_ptr<QQmlContext> m_dialogContext; + std::unique_ptr<QQuickItem> m_dialog; QString m_result; bool m_wasAccepted; |