tor-browser

commit 6c814296eba3f639052e4e1aa02bb522a192ca31
parent 4b95fe9534f7621f1306d9388da883351afa603a
Author: Sandor Molnar <smolnar@mozilla.com>
Date:   Thu,  4 Dec 2025 18:42:00 +0200

Revert "Bug 2003980: pass decodedBodySize down to the content process r=necko-reviewers,valentin" for causing assertion failures @ HttpChannelChild.cpp

This reverts commit 8fcfdc31706b47475b09cd0a9dce75151eb16c8c.

Diffstat:
M
netwerk/ipc/NeckoChannelParams.ipdlh
 | 
1
-
M
netwerk/protocol/http/HttpChannelChild.cpp
 | 
1
-
M
netwerk/protocol/http/HttpChannelParent.cpp
 | 
5
++---
M
netwerk/protocol/http/HttpTransactionChild.cpp
 | 
1
-

4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/netwerk/ipc/NeckoChannelParams.ipdlh b/netwerk/ipc/NeckoChannelParams.ipdlh
@@ -603,7 +603,6 @@ struct ResourceTimingStructArgs {
   TimeStamp redirectEnd;
   uint64_t transferSize;
   uint64_t encodedBodySize;
-  uint64_t decodedBodySize;
 
   // Not actually part of resource timing, but not part of the transaction
   // timings either. These need to be passed to HttpChannelChild along with
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -892,7 +892,6 @@ void HttpChannelChild::ProcessOnStopRequest(
     MutexAutoLock lock(mOnDataFinishedMutex);
     mTransferSize = aTiming.transferSize();
     mEncodedBodySize = aTiming.encodedBodySize();
-    mDecodedBodySize = aTiming.decodedBodySize();
   }
 
   if (StaticPrefs::network_send_OnDataFinished()) {
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1108,9 +1108,8 @@ static ResourceTimingStructArgs GetTimingAttributes(HttpBaseChannel* aChannel) {
 
   aChannel->GetEncodedBodySize(&size);
   args.encodedBodySize() = size;
-
-  aChannel->GetDecodedBodySize(&size);
-  args.decodedBodySize() = size;
+  // decodedBodySize can be computed in the child process so it doesn't need
+  // to be passed down.
 
   aChannel->GetCacheReadStart(&timeStamp);
   args.cacheReadStart() = timeStamp;
diff --git a/netwerk/protocol/http/HttpTransactionChild.cpp b/netwerk/protocol/http/HttpTransactionChild.cpp
@@ -490,7 +490,6 @@ ResourceTimingStructArgs HttpTransactionChild::GetTimingAttributes() {
   args.responseEnd() = mTransaction->GetResponseEnd();
   args.transferSize() = mTransaction->GetTransferSize();
   args.encodedBodySize() = mLogicalOffset;
-  args.decodedBodySize() = 0;
   args.redirectStart() = mRedirectStart;
   args.redirectEnd() = mRedirectEnd;
   args.transferSize() = mTransaction->GetTransferSize();