QNAM: More zerocopy changes

The zerocopy download buffer is now QSharedPointer<char>
instead of the QSharedPointer to QVarLengthArray<char>.
This will be a bit leaner to handle by QML and QtWebKit
and does not tie us to a QVLA that much.
Also fix some bugs related to signal emissions and the
return value of bytesAvailable(). Now the behaviour should be
the same if a zerocopy buffer is used or not.

Reviewed-by: Peter Hartmann
Reviewed-by: Thiago Macieira

1 files changed, 6 insertions, 3 deletions

diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 2cb3082..e944601 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -62,7 +62,7 @@
 #include "QtCore/qbuffer.h"
 #include "private/qringbuffer_p.h"
 #include "private/qbytedata_p.h"
-#include <QVarLengthArray>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -206,9 +206,12 @@ public:
     State state;
 
     // only used when the "zero copy" style is used. Else readBuffer is used.
-    QSharedPointer< QVarLengthArray<char, 0> > downloadBufferArray;
+    // Please note that the whole "zero copy" download buffer API is private right now. Do not use it.
+    qint64 downloadBufferReadPosition;
+    qint64 downloadBufferCurrentSize;
+    qint64 downloadBufferMaximumSize;
+    QSharedPointer<char> downloadBufferPointer;
     char* downloadBuffer;
-    qint64 downloadBufferPosition;
 
     Q_DECLARE_PUBLIC(QNetworkReplyImpl)
 };