Index: branches/2018Q1/www/waterfox/files/patch-bug1402766 =================================================================== --- branches/2018Q1/www/waterfox/files/patch-bug1402766 (revision 472128) +++ branches/2018Q1/www/waterfox/files/patch-bug1402766 (revision 472129) @@ -1,69 +1,69 @@ commit fd42606e30e4 Author: Boris Zbarsky Date: Tue Oct 3 18:50:10 2017 -0400 Bug 1402766 - Work around layout violating its own invariants and causing stylo code to crash. r=emilio, a=sledru MozReview-Commit-ID: 3ggJI0qmOJV --HG-- extra : source : 71d02a129bebc9dfd804b1babb8fae587d1930a8 extra : histedit_source : d36726bf4182c3820a3f8efd2d2599b114cb55c4 --- layout/generic/crashtests/1405443.html | 19 +++++++++++++++++++ layout/generic/crashtests/crashtests.list | 1 + layout/generic/nsInlineFrame.cpp | 7 +++++++ 3 files changed, 27 insertions(+) diff --git layout/generic/crashtests/1405443.html layout/generic/crashtests/1405443.html new file mode 100644 index 000000000000..79313ae1c4d4 --- /dev/null +++ layout/generic/crashtests/1405443.html @@ -0,0 +1,19 @@ -+ -+ -+ -+

-+A -+ -+ -+ -+

++ ++ ++ ++

++A ++ ++ ++ ++

diff --git layout/generic/crashtests/crashtests.list layout/generic/crashtests/crashtests.list index 25c2c32470fc..07cc75ea0f9a 100644 --- layout/generic/crashtests/crashtests.list +++ layout/generic/crashtests/crashtests.list @@ -659,3 +659,4 @@ load 1367413-1.html load 1368617-1.html load 1373586.html load 1401420-1.html +asserts(11) load 1405443.html # bug 1405443 diff --git layout/generic/nsInlineFrame.cpp layout/generic/nsInlineFrame.cpp index 089178a6ada2..ce62f822bda0 100644 --- layout/generic/nsInlineFrame.cpp +++ layout/generic/nsInlineFrame.cpp @@ -1065,6 +1065,13 @@ nsInlineFrame::UpdateStyleOfOwnedAnonBoxesForIBSplit( } nsIFrame* nextInline = blockFrame->GetProperty(nsIFrame::IBSplitSibling()); + + // This check is here due to bug 1405443. Please remove it once + // that bug is fixed. + if (!nextInline) { + break; + } + MOZ_ASSERT(nextInline, "There is always a trailing inline in an IB split"); for (nsIFrame* cont = nextInline; cont; cont = cont->GetNextContinuation()) { Index: branches/2018Q1 =================================================================== --- branches/2018Q1 (revision 472128) +++ branches/2018Q1 (revision 472129) Property changes on: branches/2018Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r472125*