Bug 1701390. Revert all of the asserts change in bug 1700812 back to debug asserts. r=mstange

Differential Revision: https://phabricator.services.mozilla.com/D110015

layout/painting/FrameLayerBuilder.cpp

@@ -5645,7 +5645,7 @@ static OpaqueRegionEntry* FindOpaqueRegionEntry(
 static const ActiveScrolledRoot* FindDirectChildASR(
     const ActiveScrolledRoot* aParent, const ActiveScrolledRoot* aDescendant) {
   MOZ_ASSERT(aDescendant, "can't start at the root when looking for a child");
-  MOZ_DIAGNOSTIC_ASSERT(ActiveScrolledRoot::IsAncestor(aParent, aDescendant));
+  MOZ_ASSERT(ActiveScrolledRoot::IsAncestor(aParent, aDescendant));
   const ActiveScrolledRoot* directChild = aDescendant;
   while (directChild->mParent != aParent) {
     directChild = directChild->mParent;

layout/painting/nsDisplayList.cpp

@@ -1454,8 +1454,7 @@ const DisplayItemClipChain* nsDisplayListBuilder::CreateClipChainIntersection(
       clip2 = clip2->mParent;
     }
     if (!asr) {
-      MOZ_DIAGNOSTIC_ASSERT(!aAncestor,
-                            "We should have exited this loop earlier");
+      MOZ_ASSERT(!aAncestor, "We should have exited this loop earlier");
       break;
     }
     asr = asr->mParent;
@@ -9568,8 +9567,9 @@ Maybe<nsRect> nsDisplayMasksAndClipPaths::GetClipWithRespectToASR(
   if (childList) {
     return Some(childList->GetClippedBoundsWithRespectToASR(aBuilder, aASR));
   }
-  MOZ_DIAGNOSTIC_ASSERT(false,
-                        "item should have finite clip with respect to aASR");
+#ifdef DEBUG
+  MOZ_ASSERT(false, "item should have finite clip with respect to aASR");
+#endif
   return Nothing();
 }
 

layout/painting/nsDisplayList.h

@@ -274,13 +274,13 @@ struct ActiveScrolledRoot {
 
   static const ActiveScrolledRoot* PickAncestor(
       const ActiveScrolledRoot* aOne, const ActiveScrolledRoot* aTwo) {
-    MOZ_DIAGNOSTIC_ASSERT(IsAncestor(aOne, aTwo) || IsAncestor(aTwo, aOne));
+    MOZ_ASSERT(IsAncestor(aOne, aTwo) || IsAncestor(aTwo, aOne));
     return Depth(aOne) <= Depth(aTwo) ? aOne : aTwo;
   }
 
   static const ActiveScrolledRoot* PickDescendant(
       const ActiveScrolledRoot* aOne, const ActiveScrolledRoot* aTwo) {
-    MOZ_DIAGNOSTIC_ASSERT(IsAncestor(aOne, aTwo) || IsAncestor(aTwo, aOne));
+    MOZ_ASSERT(IsAncestor(aOne, aTwo) || IsAncestor(aTwo, aOne));
     return Depth(aOne) >= Depth(aTwo) ? aOne : aTwo;
   }