Backed out 4 changesets (bug 1766377) for causing mochitest failures …

…on HyperTextAccessible.cpp CLOSED TREE Backed out changeset 6335511477a4 (bug 1766377) Backed out changeset e8108d6fab9f (bug 1766377) Backed out changeset 80d16d55c490 (bug 1766377) Backed out changeset 1a6583d6e52e (bug 1766377)
dothq · Apr 29, 2022 · 6e06e2d · 6e06e2d
1 parent 6314635
commit 6e06e2d
Show file tree

Hide file tree

Showing 43 changed files with 114 additions and 160 deletions.
diff --git a/accessible/windows/msaa/Compatibility.cpp b/accessible/windows/msaa/Compatibility.cpp
@@ -117,8 +117,7 @@ static DWORD WINAPI InSendMessageExHook(LPVOID lpReserved) {
 static LONG CALLBACK
 DetectInSendMessageExCompat(PEXCEPTION_POINTERS aExceptionInfo) {
   DWORD exceptionCode = aExceptionInfo->ExceptionRecord->ExceptionCode;
-  if (exceptionCode == static_cast<DWORD>(RPC_E_CANTCALLOUT_ININPUTSYNCCALL) &&
-      NS_IsMainThread()) {
+  if (exceptionCode == RPC_E_CANTCALLOUT_ININPUTSYNCCALL && NS_IsMainThread()) {
     sInSendMessageExHackEnabled = true;
     // We don't need this exception handler anymore, so remove it
     if (RemoveVectoredExceptionHandler(sVectoredExceptionHandler)) {

diff --git a/browser/components/shell/WindowsUserChoice.cpp b/browser/components/shell/WindowsUserChoice.cpp
@@ -230,7 +230,7 @@ static UniquePtr<wchar_t[]> HashString(const wchar_t* inputString) {
   DWORD h1Acc = 0;
 
   for (int i = 0; i < blockCount; ++i) {
-    for (size_t j = 0; j < DWORDS_PER_BLOCK; ++j) {
+    for (int j = 0; j < DWORDS_PER_BLOCK; ++j) {
       const DWORD* C0 = C0s[j];
       const DWORD* C1 = C1s[j];
 
@@ -385,7 +385,7 @@ bool CheckBrowserUserChoiceHashes() {
 
   const wchar_t* exts[] = {L"https", L"http", L".html", L".htm"};
 
-  for (size_t i = 0; i < ArrayLength(exts); ++i) {
+  for (int i = 0; i < ArrayLength(exts); ++i) {
     switch (CheckUserChoiceHash(exts[i], userSid.get())) {
       case CheckUserChoiceHashResult::OK_V1:
         break;

diff --git a/browser/components/shell/nsWindowsShellService.cpp b/browser/components/shell/nsWindowsShellService.cpp
@@ -1272,7 +1272,7 @@ static nsresult PinCurrentAppToTaskbarImpl(bool aCheckOnly,
   int shortcutCSIDLs[] = {CSIDL_COMMON_PROGRAMS, CSIDL_PROGRAMS,
                           CSIDL_COMMON_DESKTOPDIRECTORY,
                           CSIDL_DESKTOPDIRECTORY};
-  for (size_t i = 0; i < ArrayLength(shortcutCSIDLs); ++i) {
+  for (int i = 0; i < ArrayLength(shortcutCSIDLs); ++i) {
     // GetMatchingShortcut may fail when the exe path doesn't match, even
     // if it refers to the same file. This should be rare, and the worst
     // outcome would be failure to pin, so the risk is acceptable.
@@ -1539,7 +1539,7 @@ nsWindowsShellService::ClassifyShortcut(const nsAString& aPath,
                  {FOLDERID_UserPinned, u"\\TaskBar\\", u"Taskbar"},
                  {FOLDERID_UserPinned, u"\\StartMenu\\", u"StartMenu"}};
 
-  for (size_t i = 0; i < ArrayLength(folders); ++i) {
+  for (int i = 0; i < ArrayLength(folders); ++i) {
     nsAutoString knownPath;
 
     // These flags are chosen to avoid I/O, see bug 1363398.

diff --git a/build/moz.configure/warnings.configure b/build/moz.configure/warnings.configure
@@ -55,7 +55,7 @@ add_warning("-Wpointer-arith")
 check_and_add_warning("-Wshadow-field-in-constructor-modified")
 
 # catches comparing signed/unsigned ints
-add_warning("-Wsign-compare")
+add_warning("-Wsign-compare", when=not_clang_cl)
 
 # catches overflow bugs, few false positives
 add_warning("-Wtype-limits")

diff --git a/dom/media/platforms/wmf/MFTDecoder.cpp b/dom/media/platforms/wmf/MFTDecoder.cpp
@@ -83,7 +83,7 @@ MFTDecoder::Create(const GUID& aCategory, const GUID& aInSubtype,
   }
   auto guard = MakeScopeExit([&] {
     // Start from index 1, acts[0] will be stored as a RefPtr to release later.
-    for (UINT32 i = 1; i < actsNum; i++) {
+    for (int i = 1; i < actsNum; i++) {
       acts[i]->Release();
     }
     CoTaskMemFree(acts);

diff --git a/dom/network/TCPSocket.cpp b/dom/network/TCPSocket.cpp
@@ -971,7 +971,7 @@ NS_IMETHODIMP
 TCPSocket::OnTransportStatus(nsITransport* aTransport, nsresult aStatus,
                              int64_t aProgress, int64_t aProgressMax) {
   if (static_cast<uint32_t>(aStatus) !=
-      static_cast<uint32_t>(nsISocketTransport::STATUS_CONNECTED_TO)) {
+      nsISocketTransport::STATUS_CONNECTED_TO) {
     return NS_OK;
   }
 

diff --git a/dom/security/ReferrerInfo.cpp b/dom/security/ReferrerInfo.cpp
@@ -214,8 +214,7 @@ ReferrerPolicy ReferrerInfo::GetDefaultReferrerPolicy(nsIHttpChannel* aChannel,
           !ContentBlocking::ShouldAllowAccessFor(aChannel, aURI,
                                                  &rejectedReason) &&
           rejectedReason !=
-              static_cast<uint32_t>(
-                  nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN);
+              nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN;
       // Here we intentionally do not notify about the rejection reason, if any
       // in order to avoid this check to have any visible side-effects (e.g. a
       // web console report.)

diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp
@@ -1273,7 +1273,7 @@ bool Factory::ReadbackTexture(uint8_t* aDestData, int32_t aDestStride,
   uint32_t width = srcDesc.Width;
   uint32_t height = srcDesc.Height;
   int bpp = BytesPerPixel(gfx::ToPixelFormat(srcDesc.Format));
-  for (uint32_t y = 0; y < height; y++) {
+  for (int y = 0; y < height; y++) {
     memcpy(aDestData + aDestStride * y,
            (unsigned char*)(srcMap.pData) + srcMap.RowPitch * y, width * bpp);
   }

diff --git a/gfx/layers/d3d11/CompositorD3D11.cpp b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -1092,8 +1092,8 @@ bool CompositorD3D11::VerifyBufferSize() {
     return false;
   }
 
-  if (((static_cast<int32_t>(swapDesc.BufferDesc.Width) == mSize.width &&
-        static_cast<int32_t>(swapDesc.BufferDesc.Height) == mSize.height) ||
+  if (((swapDesc.BufferDesc.Width == mSize.width &&
+        swapDesc.BufferDesc.Height == mSize.height) ||
        mSize.width <= 0 || mSize.height <= 0) &&
       !mVerifyBuffersFailed) {
     return true;

diff --git a/gfx/layers/d3d11/TextureD3D11.cpp b/gfx/layers/d3d11/TextureD3D11.cpp
@@ -1274,8 +1274,8 @@ bool DataTextureSourceD3D11::Update(DataSourceSurface* aSurface,
       mTexture->GetDesc(&currentDesc);
 
       // Make sure there's no size mismatch, if there is, recreate.
-      if (static_cast<int32_t>(currentDesc.Width) != mSize.width ||
-          static_cast<int32_t>(currentDesc.Height) != mSize.height ||
+      if (currentDesc.Width != mSize.width ||
+          currentDesc.Height != mSize.height ||
           currentDesc.Format != dxgiFormat) {
         mTexture = nullptr;
         // Make sure we upload the whole surface.

diff --git a/gfx/layers/ipc/ContentCompositorBridgeParent.cpp b/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
@@ -245,7 +245,7 @@ mozilla::ipc::IPCResult ContentCompositorBridgeParent::RecvCheckContentOnlyTDR(
   gfx::D3D11DeviceStatus status;
   dm->ExportDeviceInfo(&status);
 
-  if (sequenceNum == static_cast<uint32_t>(status.sequenceNumber()) && !dm->HasDeviceReset()) {
+  if (sequenceNum == status.sequenceNumber() && !dm->HasDeviceReset()) {
     *isContentOnlyTDR = true;
   }
 

diff --git a/gfx/thebes/D3D11Checks.cpp b/gfx/thebes/D3D11Checks.cpp
@@ -120,7 +120,7 @@ bool D3D11Checks::DoesRenderTargetViewNeedRecreating(ID3D11Device* aDevice) {
       gfxCriticalNote << "DoesRecreatingMapFailed " << hexa(hr);
       return false;
     }
-    uint32_t resultColor = *(uint32_t*)mapped.pData;
+    int resultColor = *(int*)mapped.pData;
     deviceContext->Unmap(cpuTexture, 0);
     cpuTexture = nullptr;
 
@@ -151,7 +151,7 @@ bool D3D11Checks::DoesDeviceWork() {
   if (GetModuleHandleW(L"igd10umd32.dll")) {
     const wchar_t* checkModules[] = {L"dlumd32.dll", L"dlumd11.dll",
                                      L"dlumd10.dll"};
-    for (size_t i = 0; i < PR_ARRAY_SIZE(checkModules); i += 1) {
+    for (int i = 0; i < PR_ARRAY_SIZE(checkModules); i += 1) {
       if (GetModuleHandleW(checkModules[i])) {
         nsString displayLinkModuleVersionString;
         gfxWindowsPlatform::GetDLLVersion(checkModules[i],
@@ -406,7 +406,7 @@ void D3D11Checks::WarnOnAdapterMismatch(ID3D11Device* device) {
   gfxInfo->GetAdapterVendorID(vendorID);
   nsresult ec;
   int32_t vendor = vendorID.ToInteger(&ec, 16);
-  if (vendor != static_cast<int32_t>(desc.VendorId)) {
+  if (vendor != desc.VendorId) {
     gfxCriticalNote << "VendorIDMismatch V " << hexa(vendor) << " "
                     << hexa(desc.VendorId);
   }

diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1247,7 +1247,7 @@ void gfxDWriteFontList::AppendFamiliesFromCollection(
         sysLocIndex = 1;
       }
       for (unsigned index = 0; index < names.Length(); ++index) {
-        addFamily(names[index], index != static_cast<unsigned>(sysLocIndex));
+        addFamily(names[index], index != sysLocIndex);
       }
     }
   }

diff --git a/gfx/thebes/gfxGDIFont.cpp b/gfx/thebes/gfxGDIFont.cpp
@@ -447,7 +447,7 @@ uint32_t gfxGDIFont::GetGlyph(uint32_t aUnicode, uint32_t aVarSelector) {
 
   wchar_t ch = aUnicode;
   WORD glyph;
-  HRESULT ret = ScriptGetCMap(nullptr, &mScriptCache, &ch, 1, 0, &glyph);
+  DWORD ret = ScriptGetCMap(nullptr, &mScriptCache, &ch, 1, 0, &glyph);
   if (ret != S_OK) {
     AutoDC dc;
     AutoSelectFont fs(dc.GetDC(), GetHFONT());
@@ -458,8 +458,8 @@ uint32_t gfxGDIFont::GetGlyph(uint32_t aUnicode, uint32_t aVarSelector) {
     if (ret != S_OK) {
       // If ScriptGetCMap still failed, fall back to GetGlyphIndicesW
       // (see bug 1105807).
-      DWORD ret = GetGlyphIndicesW(dc.GetDC(), &ch, 1, &glyph,
-                                   GGI_MARK_NONEXISTING_GLYPHS);
+      ret = GetGlyphIndicesW(dc.GetDC(), &ch, 1, &glyph,
+                             GGI_MARK_NONEXISTING_GLYPHS);
       if (ret == GDI_ERROR || glyph == 0xFFFF) {
         glyph = 0;
       }

diff --git a/intl/lwbrk/nsUniscribeBreaker.cpp b/intl/lwbrk/nsUniscribeBreaker.cpp
@@ -118,7 +118,7 @@ void NS_GetComplexLineBreaks(const char16_t* aText, uint32_t aLength,
   }
 
   bool mismatch = false;
-  for (uint32_t i = 0; i < aLength; ++i) {
+  for (int i = 0; i < aLength; ++i) {
     if (aBreakBefore[i] != brokeredBreaks[i]) {
       mismatch = true;
       break;
@@ -129,13 +129,13 @@ void NS_GetComplexLineBreaks(const char16_t* aText, uint32_t aLength,
     // The logging here doesn't handle surrogates, but we only have tests using
     // Thai currently, which is BMP-only.
     printf_stderr("uniscribe: ");
-    for (uint32_t i = 0; i < aLength; ++i) {
+    for (int i = 0; i < aLength; ++i) {
       if (aBreakBefore[i]) printf_stderr("#");
       printf_stderr("%s", NS_ConvertUTF16toUTF8(aText + i, 1).get());
     }
     printf_stderr("\n");
     printf_stderr("brokered : ");
-    for (uint32_t i = 0; i < aLength; ++i) {
+    for (int i = 0; i < aLength; ++i) {
       if (brokeredBreaks[i]) printf_stderr("#");
       printf_stderr("%s", NS_ConvertUTF16toUTF8(aText + i, 1).get());
     }

diff --git a/ipc/chromium/src/base/thread_local.h b/ipc/chromium/src/base/thread_local.h
@@ -52,9 +52,7 @@
 
 #include "base/basictypes.h"
 
-#if defined(OS_WIN)
-#  include <windows.h>
-#elif defined(OS_POSIX)
+#if defined(OS_POSIX)
 #  include <pthread.h>
 #endif
 
@@ -63,7 +61,7 @@ namespace base {
 // Helper functions that abstract the cross-platform APIs.  Do not use directly.
 struct ThreadLocalPlatform {
 #if defined(OS_WIN)
-  typedef DWORD SlotType;
+  typedef int SlotType;
 #elif defined(OS_POSIX)
   typedef pthread_key_t SlotType;
 #endif

diff --git a/ipc/glue/WindowsMessageLoop.cpp b/ipc/glue/WindowsMessageLoop.cpp
@@ -377,7 +377,8 @@ ProcessOrDeferMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 #if defined(ACCESSIBILITY)
     case WM_GETOBJECT: {
       if (!::GetPropW(hwnd, k3rdPartyWindowProp)) {
-        if (lParam == OBJID_CLIENT || lParam == MOZOBJID_UIAROOT) {
+        DWORD objId = static_cast<DWORD>(lParam);
+        if (objId == OBJID_CLIENT || objId == MOZOBJID_UIAROOT) {
           WNDPROC oldWndProc = (WNDPROC)GetProp(hwnd, kOldWndProcProp);
           if (oldWndProc) {
             return CallWindowProcW(oldWndProc, hwnd, uMsg, wParam, lParam);

diff --git a/mozglue/misc/PreXULSkeletonUI.cpp b/mozglue/misc/PreXULSkeletonUI.cpp
@@ -315,7 +315,7 @@ static bool ProfileDbHasStartWithLastProfile(IFStream& iniContents) {
   bool inGeneral = false;
   std::string line;
   while (std::getline(iniContents, line)) {
-    size_t whitespace = 0;
+    int whitespace = 0;
     while (line.length() > whitespace &&
            (line[whitespace] == ' ' || line[whitespace] == '\t')) {
       whitespace++;
@@ -1000,7 +1000,7 @@ Result<Ok, PreXULSkeletonUIError> DrawSkeletonUI(
     }
   }
 
-  for (size_t i = 1; i < noPlaceholderSpans.length(); i++) {
+  for (int i = 1; i < noPlaceholderSpans.length(); i++) {
     int start = noPlaceholderSpans[i - 1].end + placeholderMargin;
     int end = noPlaceholderSpans[i].start - placeholderMargin;
     if (start + 2 * placeholderBorderRadius >= end) {
@@ -1705,7 +1705,7 @@ static Result<Vector<CSSPixelSpan>, PreXULSkeletonUIError> ReadRegCSSPixelSpans(
 
   Vector<CSSPixelSpan> resultVector;
   double* asDoubles = reinterpret_cast<double*>(buffer.get());
-  for (size_t i = 0; i < dataLen / (2 * sizeof(double)); i++) {
+  for (int i = 0; i < dataLen / (2 * sizeof(double)); i++) {
     CSSPixelSpan span = {};
     span.start = *(asDoubles++);
     span.end = *(asDoubles++);

diff --git a/security/sandbox/chromium-shim/sandbox/win/permissionsService.cpp b/security/sandbox/chromium-shim/sandbox/win/permissionsService.cpp
@@ -36,7 +36,7 @@ IsFlashTempFile(std::wstring aFilename, std::wstring* aFolder=nullptr)
 {
   // Assume its a flash file if the base name begins with "FlashTmp",
   // ends with ".tmp" and has an int in-between them.
-  size_t slashIdx = aFilename.find_last_of(L'\\');
+  int slashIdx = aFilename.find_last_of(L'\\');
   if (slashIdx != std::wstring::npos) {
     if (aFolder) {
       *aFolder = aFilename.substr(0, slashIdx + 1);

diff --git a/storage/TelemetryVFS.cpp b/storage/TelemetryVFS.cpp
@@ -576,7 +576,7 @@ int xFullPathname(sqlite3_vfs* vfs, const char* zName, int nOut, char* zOut) {
        (zName[0] == '\\' && zName[1] == '\\' && zName[2] == '?' &&
         zName[3] == '\\'))) {
     MOZ_ASSERT(nOut >= vfs->mxPathname);
-    MOZ_ASSERT(static_cast<size_t>(nOut) > strlen(zName));
+    MOZ_ASSERT(nOut > strlen(zName));
 
     size_t index = 0;
     while (zName[index] != '\0') {

diff --git a/toolkit/components/aboutthirdparty/tests/gtest/TestAboutThirdParty.cpp b/toolkit/components/aboutthirdparty/tests/gtest/TestAboutThirdParty.cpp
@@ -104,7 +104,7 @@ TEST(AboutThirdParty, InstallLocations)
   };
 
   nsTArray<InstallLocationT> locations(ArrayLength(kDirectoriesUnsorted));
-  for (size_t i = 0; i < ArrayLength(kDirectoriesUnsorted); ++i) {
+  for (int i = 0; i < ArrayLength(kDirectoriesUnsorted); ++i) {
     locations.EmplaceBack(kDirectoriesUnsorted[i], new InstalledApplication());
   }
 

diff --git a/toolkit/components/antitracking/ContentBlockingNotifier.cpp b/toolkit/components/antitracking/ContentBlockingNotifier.cpp
@@ -115,23 +115,15 @@ void ReportBlockingToConsole(uint64_t aWindowID, nsIURI* aURI,
   MOZ_ASSERT(
       aRejectedReason == 0 ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN) ||
-      aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL) ||
-      aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN));
+          nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN ||
+      aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL ||
+      aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN);
 
   if (aURI->SchemeIs("chrome") || aURI->SchemeIs("about")) {
     return;
@@ -417,23 +409,15 @@ void ContentBlockingNotifier::OnDecision(nsIChannel* aChannel,
   MOZ_ASSERT(
       aRejectedReason == 0 ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION) ||
-      aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL) ||
-      aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN));
+          nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN ||
+      aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL ||
+      aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN);
   MOZ_ASSERT(aDecision == BlockingDecision::eBlock ||
              aDecision == BlockingDecision::eAllow);
 
@@ -456,23 +440,15 @@ void ContentBlockingNotifier::OnDecision(nsPIDOMWindowInner* aWindow,
   MOZ_ASSERT(
       aRejectedReason == 0 ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION) ||
-      aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER) ||
-      aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL) ||
+          nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER ||
       aRejectedReason ==
-          static_cast<uint32_t>(
-              nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN));
+          nsIWebProgressListener::STATE_COOKIES_PARTITIONED_FOREIGN ||
+      aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL ||
+      aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN);
   MOZ_ASSERT(aDecision == BlockingDecision::eBlock ||
              aDecision == BlockingDecision::eAllow);