Bug 1467526 - Add a few MOZ_DIAGNOSTIC_ASSERT in nsLineBox::DeleteLin…

…eList to enforce our invariants better. r=emilio
iaxat · Jun 7, 2018 · 55a85e8 · 55a85e8
1 parent cc3c764
commit 55a85e8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp
@@ -396,12 +396,14 @@ nsLineBox::DeleteLineList(nsPresContext* aPresContext, nsLineList& aLines,
     }
     while (line->GetChildCount() > 0) {
       nsIFrame* child = aFrames->RemoveFirstChild();
-      MOZ_ASSERT(child == line->mFirstChild, "Lines out of sync");
+      MOZ_DIAGNOSTIC_ASSERT(child->PresContext() == aPresContext);
+      MOZ_DIAGNOSTIC_ASSERT(child == line->mFirstChild, "Lines out of sync");
       line->mFirstChild = aFrames->FirstChild();
       line->NoteFrameRemoved(child);
       child->DestroyFrom(aDestructRoot, aPostDestroyData);
     }
-
+    MOZ_DIAGNOSTIC_ASSERT(line == aLines.front(),
+                          "destroying child frames messed up our lines!");
     aLines.pop_front();
     line->Destroy(shell);
   }