Bug 1263235, part 3 - Move PHttpChannel::OnTransportAndData's data argument last. r=mayhemer

This will reduce internal memory fragmentation for the IPC::Message used to make this call.

netwerk/protocol/http/HttpChannelChild.cpp

@@ -581,7 +581,7 @@ class TransportAndDataEvent : public ChannelEvent
   void Run()
   {
     mChild->OnTransportAndData(mChannelStatus, mTransportStatus, mProgress,
-                               mProgressMax, mData, mOffset, mCount);
+                               mProgressMax, mOffset, mCount, mData);
   }
  private:
   HttpChannelChild* mChild;
@@ -599,9 +599,9 @@ HttpChannelChild::RecvOnTransportAndData(const nsresult& channelStatus,
                                          const nsresult& transportStatus,
                                          const uint64_t& progress,
                                          const uint64_t& progressMax,
-                                         const nsCString& data,
                                          const uint64_t& offset,
-                                         const uint32_t& count)
+                                         const uint32_t& count,
+                                         const nsCString& data)
 {
   LOG(("HttpChannelChild::RecvOnTransportAndData [this=%p]\n", this));
   MOZ_RELEASE_ASSERT(!mFlushedForDiversion,
@@ -656,9 +656,9 @@ HttpChannelChild::OnTransportAndData(const nsresult& channelStatus,
                                      const nsresult& transportStatus,
                                      const uint64_t progress,
                                      const uint64_t& progressMax,
-                                     const nsCString& data,
                                      const uint64_t& offset,
-                                     const uint32_t& count)
+                                     const uint32_t& count,
+                                     const nsCString& data)
 {
   LOG(("HttpChannelChild::OnTransportAndData [this=%p]\n", this));
 

netwerk/protocol/http/HttpChannelChild.h

@@ -126,9 +126,9 @@ protected:
                               const nsresult& status,
                               const uint64_t& progress,
                               const uint64_t& progressMax,
-                              const nsCString& data,
                               const uint64_t& offset,
-                              const uint32_t& count) override;
+                              const uint32_t& count,
+                              const nsCString& data) override;
   bool RecvOnStopRequest(const nsresult& statusCode, const ResourceTimingStruct& timing) override;
   bool RecvOnProgress(const int64_t& progress, const int64_t& progressMax) override;
   bool RecvOnStatus(const nsresult& status) override;
@@ -268,9 +268,9 @@ private:
                           const nsresult& status,
                           const uint64_t progress,
                           const uint64_t& progressMax,
-                          const nsCString& data,
                           const uint64_t& offset,
-                          const uint32_t& count);
+                          const uint32_t& count,
+                          const nsCString& data);
   void OnStopRequest(const nsresult& channelStatus, const ResourceTimingStruct& timing);
   void MaybeDivertOnStop(const nsresult& aChannelStatus);
   void OnProgress(const int64_t& progress, const int64_t& progressMax);

netwerk/protocol/http/HttpChannelParent.cpp

@@ -1150,7 +1150,7 @@ HttpChannelParent::OnDataAvailable(nsIRequest *aRequest,
     // child doesn't use them.
     if (mIPCClosed || !SendOnTransportAndData(channelStatus, mStoredStatus,
                                               mStoredProgress, mStoredProgressMax,
-                                              data, aOffset, toRead)) {
+                                              aOffset, toRead, data)) {
       return NS_ERROR_UNEXPECTED;
     }
 

netwerk/protocol/http/PHttpChannel.ipdl

@@ -107,9 +107,9 @@ child:
                            nsresult  transportStatus,
                            uint64_t  progress,
                            uint64_t  progressMax,
-                           nsCString data,
                            uint64_t  offset,
-                           uint32_t  count);
+                           uint32_t  count,
+                           nsCString data);
 
   async OnStopRequest(nsresult channelStatus, ResourceTimingStruct timing);