# HG changeset patch # Parent 7ba4cea5382dda70acbc94ac91013958d8dfaad7 bug 695430 - stop trying to insert previously emptied framelists r=bzbarsky diff --git a/layout/tables/crashtests/695430-1.html b/layout/tables/crashtests/695430-1.html new file mode 100644 --- /dev/null +++ b/layout/tables/crashtests/695430-1.html @@ -0,0 +1,23 @@ + + + + + +
+ + + + + + + + + + + +
+ diff --git a/layout/tables/crashtests/crashtests.list b/layout/tables/crashtests/crashtests.list --- a/layout/tables/crashtests/crashtests.list +++ b/layout/tables/crashtests/crashtests.list @@ -110,3 +110,4 @@ asserts(0-3) load 595758-1.xhtml # Bug 4 load 595758-2.xhtml load 678447-1.html load 691824-1.xhtml +load 695430-1.html diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp --- a/layout/tables/nsTableRowGroupFrame.cpp +++ b/layout/tables/nsTableRowGroupFrame.cpp @@ -1032,6 +1032,8 @@ nsTableRowGroupFrame::UndoContinuedRow(n // will not have reflowed yet to pick up content from any overflow lines. overflows->DestroyFrame(aRow); + if (overflows->IsEmpty()) + return; // Put the overflow rows into our child list mFrames.InsertFrames(nsnull, rowBefore, *overflows); }