diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp index fa2c74f1f..558d47d75 100644 --- a/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp @@ -27,14 +27,17 @@ #include "WebPageProxy.h" #include "PageClient.h" -#include "QtNetworkReplyData.h" -#include "QtPageClient.h" -#include "qquicknetworkreply_p.h" #include "WebPageMessages.h" #include "WebProcessProxy.h" #include <WebCore/Editor.h> #include <WebCore/NotImplemented.h> +#if HAVE(QTQUICK) +#include "QtNetworkReplyData.h" +#include "QtPageClient.h" +#include "qquicknetworkreply_p.h" +#endif + using namespace WebCore; namespace WebKit { @@ -87,19 +90,23 @@ void WebPageProxy::registerApplicationScheme(const String& scheme) void WebPageProxy::resolveApplicationSchemeRequest(QtNetworkRequestData request) { +#if HAVE(QTQUICK) RefPtr<QtRefCountedNetworkRequestData> requestData = adoptRef(new QtRefCountedNetworkRequestData(request)); m_applicationSchemeRequests.add(requestData); static_cast<QtPageClient*>(m_pageClient)->handleApplicationSchemeRequest(requestData); +#endif } void WebPageProxy::sendApplicationSchemeReply(const QQuickNetworkReply* reply) { +#if HAVE(QTQUICK) RefPtr<QtRefCountedNetworkRequestData> requestData = reply->networkRequestData(); if (m_applicationSchemeRequests.contains(requestData)) { RefPtr<QtRefCountedNetworkReplyData> replyData = reply->networkReplyData(); process()->send(Messages::WebPage::ApplicationSchemeReply(replyData->data()), pageID()); m_applicationSchemeRequests.remove(requestData); } +#endif } void WebPageProxy::setUserScripts(const Vector<String>& scripts) |