wasm: rewrite QNetworkReplyWasmImpl to remove EM_ASM

and fix handling of incoming binary data

Change-Id: I31e97505ad4ff64cf8e380df5d0d6b70c3cd60b0
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 3 insertions, 13 deletions

diff --git a/src/network/access/qnetworkreplywasmimpl_p.h b/src/network/access/qnetworkreplywasmimpl_p.h
index a707390503..69c90de41a 100644
--- a/src/network/access/qnetworkreplywasmimpl_p.h
+++ b/src/network/access/qnetworkreplywasmimpl_p.h
@@ -95,7 +95,6 @@ public:
 
 private:
     QByteArray methodName() const;
-
 };
 
 class QNetworkReplyWasmImplPrivate: public QNetworkReplyPrivate
@@ -106,19 +105,12 @@ public:
 
     QNetworkAccessManagerPrivate *managerPrivate;
     void doSendRequest();
-
-    void jsRequest(const QString &verb, const QString &url, void *, void *, void *, void *);
-
-    static void onLoadCallback(void *data, int statusCode, int statusReason, int readyState, int textBuffer, int size);
-    static void onProgressCallback(void *data, int done, int bytesTotal, uint timestamp);
-    static void onRequestErrorCallback(void *data, int statusCode, int statusReason);
-    static void onStateChangedCallback(int status);
-    static void onResponseHeadersCallback(void *data, int headers);
+    static void setReplyAttributes(quintptr data, int statusCode, const QString &statusReason);
 
     void emitReplyError(QNetworkReply::NetworkError errorCode, const QString &);
     void emitDataReadProgress(qint64 done, qint64 total);
-    void dataReceived(char *buffer, int bufferSize);
-    void headersReceived(char *buffer);
+    void dataReceived(const QByteArray &buffer, int bufferSize);
+    void headersReceived(const QString &bufferString);
 
     void setup(QNetworkAccessManager::Operation op, const QNetworkRequest &request,
                QIODevice *outgoingData);
@@ -148,6 +140,4 @@ public:
 
 QT_END_NAMESPACE
 
-//Q_DECLARE_METATYPE(QNetworkRequest::KnownHeaders)
-
 #endif // QNETWORKREPLYWASMIMPL_H