1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: emit finished after QNetworkReply abort

Browse Source 
Change-Id: I23445f5e0c936b82aa5d65b261d456a563deab9a
Fixes: QTBUG-72516
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2018-12-13 20:48:49 +10:00
parent c41c5159d7
commit 1387f1910b
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/network/access/qnetworkreplywasmimpl.cpp
View File

@ -222,11 +222,17 @@ QByteArray QNetworkReplyWasmImpl::methodName() const
void QNetworkReplyWasmImpl::close() void QNetworkReplyWasmImpl::close()
{ {
setFinished(true);
emit finished();
QNetworkReply::close(); QNetworkReply::close();
} }
void QNetworkReplyWasmImpl::abort() void QNetworkReplyWasmImpl::abort()
{ {
Q_D(const QNetworkReplyWasmImpl);
d->doAbort();
close(); close();
} }
@ -307,24 +313,29 @@ void QNetworkReplyWasmImplPrivate::setReplyAttributes(quintptr data, int statusC
handler->q_func()->setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, statusReason); handler->q_func()->setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, statusReason);
} }
void QNetworkReplyWasmImplPrivate::doAbort() const
{
m_xhr.call<void>("abort");
}
void QNetworkReplyWasmImplPrivate::doSendRequest() void QNetworkReplyWasmImplPrivate::doSendRequest()
{ {
Q_Q(QNetworkReplyWasmImpl); Q_Q(QNetworkReplyWasmImpl);
totalDownloadSize = 0; totalDownloadSize = 0;
val xhr = val::global("XMLHttpRequest").new_(); m_xhr = val::global("XMLHttpRequest").new_();
std::string verb = q->methodName().toStdString(); std::string verb = q->methodName().toStdString();
QString extraDataString; QString extraDataString;
xhr.call<void>("open", verb, request.url().toString().toStdString()); m_xhr.call<void>("open", verb, request.url().toString().toStdString());
xhr.set("onerror", val::module_property("QNetworkReplyWasmImplPrivate_requestErrorCallback")); m_xhr.set("onerror", val::module_property("QNetworkReplyWasmImplPrivate_requestErrorCallback"));
xhr.set("onload", val::module_property("QNetworkReplyWasmImplPrivate_loadCallback")); m_xhr.set("onload", val::module_property("QNetworkReplyWasmImplPrivate_loadCallback"));
xhr.set("onprogress", val::module_property("QNetworkReplyWasmImplPrivate_progressCallback")); m_xhr.set("onprogress", val::module_property("QNetworkReplyWasmImplPrivate_progressCallback"));
xhr.set("onreadystatechange", val::module_property("QNetworkReplyWasmImplPrivate_responseHeadersCallback")); m_xhr.set("onreadystatechange", val::module_property("QNetworkReplyWasmImplPrivate_responseHeadersCallback"));
xhr.set("data-handler", val(quintptr(reinterpret_cast<void *>(this)))); m_xhr.set("data-handler", val(quintptr(reinterpret_cast<void *>(this))));
QByteArray contentType = request.rawHeader("Content-Type"); QByteArray contentType = request.rawHeader("Content-Type");
@ -343,7 +354,7 @@ void QNetworkReplyWasmImplPrivate::doSendRequest()
} }
if (contentType.contains("json")) { if (contentType.contains("json")) {
if (!extraDataString.isEmpty()) { if (!extraDataString.isEmpty()) {
xhr.set("responseType", val("json")); m_xhr.set("responseType", val("json"));
dataToSend = val(extraDataString.toStdString()); dataToSend = val(extraDataString.toStdString());
} }
} }
@ -360,9 +371,9 @@ void QNetworkReplyWasmImplPrivate::doSendRequest()
} }
// set request headers // set request headers
for (auto header : request.rawHeaderList()) { for (auto header : request.rawHeaderList()) {
xhr.call<void>("setRequestHeader", header.toStdString(), request.rawHeader(header).toStdString()); m_xhr.call<void>("setRequestHeader", header.toStdString(), request.rawHeader(header).toStdString());
} }
xhr.call<void>("send", dataToSend); m_xhr.call<void>("send", dataToSend);
} }
void QNetworkReplyWasmImplPrivate::emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString) void QNetworkReplyWasmImplPrivate::emitReplyError(QNetworkReply::NetworkError errorCode, const QString &errorString)

4
src/network/access/qnetworkreplywasmimpl_p.h
View File

@ -62,6 +62,7 @@
#include <emscripten.h> #include <emscripten.h>
#include <emscripten/html5.h> #include <emscripten/html5.h>
#include <emscripten/val.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -134,6 +135,9 @@ public:
QIODevice *outgoingData; QIODevice *outgoingData;
QSharedPointer<QRingBuffer> outgoingDataBuffer; QSharedPointer<QRingBuffer> outgoingDataBuffer;
emscripten::val m_xhr = emscripten::val::null();
void doAbort() const;
static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url); static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url);
Q_DECLARE_PUBLIC(QNetworkReplyWasmImpl) Q_DECLARE_PUBLIC(QNetworkReplyWasmImpl)
}; };