From ebde29e57abf0e2d98ada0b55c1a332975b1883e Mon Sep 17 00:00:00 2001
From: Sandor Molnar <smolnar@mozilla.com>
Date: Wed, 3 Apr 2024 17:49:24 +0300
Subject: [PATCH] Backed out changeset 4191b252db9b (bug 1886734) for causing
 build bustages @netwerk/streamconv/converters/nsHTTPCompressConv.cpp

---
 modules/libpref/init/StaticPrefList.yaml           |  6 ----
 .../streamconv/converters/nsHTTPCompressConv.cpp   | 39 ++++++----------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index b5bbe9d4cbd1..c67762ed73cf 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -13304,12 +13304,6 @@
   value: true
   mirror: always
 
-# Minimum content-lengthe to use off-main-thread decompression of network streams
-- name: network.decompression_off_mainthread_min_size
-  type: int32_t
-  value: 512
-  mirror: always
-
 #---------------------------------------------------------------------------
 # Prefs starting with "nglayout."
 #---------------------------------------------------------------------------
diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
index e7aaac285082..aad23b52d429 100644
--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -21,7 +21,6 @@
 #include "nsIRequest.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsIThreadRetargetableRequest.h"
-#include "nsIChannel.h"
 
 // brotli headers
 #undef assert
@@ -144,35 +143,17 @@ nsHTTPCompressConv::MaybeRetarget(nsIRequest* request) {
   nsCOMPtr<nsISerialEventTarget> target;
   rv = req->GetDeliveryTarget(getter_AddRefs(target));
   if (NS_FAILED(rv) || !target || target->IsOnCurrentThread()) {
-    nsCOMPtr<nsIChannel> channel(do_QueryInterface(request));
-    int64_t length = -1;
-    if (channel) {
-      channel->GetContentLength(&length);
-      // If this fails we'll retarget
+    // No retargetting was performed.  Decompress off MainThread,
+    // and dispatch results back to MainThread
+    nsCOMPtr<nsISerialEventTarget> backgroundThread;
+    rv = NS_CreateBackgroundTaskQueue("nsHTTPCompressConv",
+                                      getter_AddRefs(backgroundThread));
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = req->RetargetDeliveryTo(backgroundThread);
+    NS_ENSURE_SUCCESS(rv, rv);
+    if (NS_SUCCEEDED(rv)) {
+      mDispatchToMainThread = true;
     }
-    if (length <= 0 ||
-        length >=
-            StaticPrefs::network_decompression_off_mainthread_min_size()) {
-      LOG(("MaybeRetarget: Retargeting to background thread: Length %ld",
-           length));
-      // No retargetting was performed.  Decompress off MainThread,
-      // and dispatch results back to MainThread.
-      // Don't do this if the input is small, if we know the length.
-      // If the length is 0 (unknown), always use OMT.
-      nsCOMPtr<nsISerialEventTarget> backgroundThread;
-      rv = NS_CreateBackgroundTaskQueue("nsHTTPCompressConv",
-                                        getter_AddRefs(backgroundThread));
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = req->RetargetDeliveryTo(backgroundThread);
-      NS_ENSURE_SUCCESS(rv, rv);
-      if (NS_SUCCEEDED(rv)) {
-        mDispatchToMainThread = true;
-      }
-    } else {
-      LOG(("MaybeRetarget: Not retargeting: Length %ld", length));
-    }
-  } else {
-    LOG(("MaybeRetarget: Don't need to retarget"));
   }
 
   return NS_OK;
-- 
2.11.4.GIT