diff options
Diffstat (limited to 'Source/WebCore/platform/network/qt/ResourceHandleQt.cpp')
| -rw-r--r-- | Source/WebCore/platform/network/qt/ResourceHandleQt.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp b/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp index cd17660..a6da432 100644 --- a/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp +++ b/Source/WebCore/platform/network/qt/ResourceHandleQt.cpp @@ -42,9 +42,6 @@ #include "ResourceHandleInternal.h" #include "SharedBuffer.h" -// FIXME: WebCore including these headers from WebKit is a massive layering violation. -#include "qwebframe_p.h" - #include <QAbstractNetworkCache> #include <QCoreApplication> #include <QUrl> @@ -140,7 +137,7 @@ bool ResourceHandle::start(NetworkingContext* context) getInternal()->m_context = context; ResourceHandleInternal *d = getInternal(); - d->m_job = new QNetworkReplyHandler(this, QNetworkReplyHandler::LoadMode(d->m_defersLoading)); + d->m_job = new QNetworkReplyHandler(this, QNetworkReplyHandler::AsynchronousLoad, d->m_defersLoading); return true; } @@ -207,7 +204,7 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const d->m_firstRequest.setURL(urlWithCredentials); } d->m_context = context; - d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::LoadSynchronously); + d->m_job = new QNetworkReplyHandler(handle.get(), QNetworkReplyHandler::SynchronousLoad); QNetworkReply* reply = d->m_job->reply(); // When using synchronous calls, we are finished when reaching this point. @@ -225,8 +222,9 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const void ResourceHandle::platformSetDefersLoading(bool defers) { - if (d->m_job) - d->m_job->setLoadMode(QNetworkReplyHandler::LoadMode(defers)); + if (!d->m_job) + return; + d->m_job->setLoadingDeferred(defers); } } // namespace WebCore |