diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-24 22:40:03 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-25 18:29:55 +0000 |
| commit | 4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4 (patch) | |
| tree | 02bd448d49627f059df0d8036fbdb9d9ee883a50 /Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp | |
| parent | bd3f57b00bee3088971209a0ebc513eb1ef4ba14 (diff) | |
| download | qtwebkit-4bd713d56aa9bb86bc96ea9cb0c64cbf94bf43d4.tar.gz | |
Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d
Change-Id: I7df106cef8ce93ce33e49ad6fb0d202cd066d87c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp index 482076370..c58f20065 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp @@ -37,10 +37,10 @@ namespace WebKit { QtWebPageUIClient::QtWebPageUIClient(WKPageRef pageRef, QQuickWebView* webView) : m_webView(webView) { - WKPageUIClient uiClient; - memset(&uiClient, 0, sizeof(WKPageUIClient)); - uiClient.version = kWKPageUIClientCurrentVersion; - uiClient.clientInfo = this; + WKPageUIClientV1 uiClient; + memset(&uiClient, 0, sizeof(WKPageUIClientV1)); + uiClient.base.version = 1; + uiClient.base.clientInfo = this; uiClient.runJavaScriptAlert = runJavaScriptAlert; uiClient.runJavaScriptConfirm = runJavaScriptConfirm; uiClient.runJavaScriptPrompt = runJavaScriptPrompt; @@ -49,7 +49,7 @@ QtWebPageUIClient::QtWebPageUIClient(WKPageRef pageRef, QQuickWebView* webView) uiClient.exceededDatabaseQuota = exceededDatabaseQuota; uiClient.decidePolicyForGeolocationPermissionRequest = policyForGeolocationPermissionRequest; uiClient.decidePolicyForNotificationPermissionRequest = policyForNotificationPermissionRequest; - WKPageSetPageUIClient(pageRef, &uiClient); + WKPageSetPageUIClient(pageRef, &uiClient.base); } quint64 QtWebPageUIClient::exceededDatabaseQuota(const QString& databaseName, const QString& displayName, WKSecurityOriginRef securityOrigin, quint64 currentQuota, quint64 currentOriginUsage, quint64 currentDatabaseUsage, quint64 expectedUsage) |