From e45edf9ebc1f8e89686cace12c60085af7a4cdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sat, 30 Jun 2018 04:40:31 +0200 Subject: [PATCH] Bug 215083: Account for subclasses in the next-in-flow assertion. r=me a=fix-uplift MozReview-Commit-ID: 2E8Fm4Lxnf8 --HG-- extra : source : c3983769db6d28b2af6f4f7d1dee2f4ed4aa887a extra : amend_source : 94001c14b0f333814e099fc0a8c57d120bb6feaf --- layout/generic/nsImageFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index 3259b50d7d22..e1138ccb9bf7 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -293,7 +293,7 @@ nsImageFrame::Init(nsIContent* aContent, nsIFrame* aPrevInFlow) { MOZ_ASSERT_IF(aPrevInFlow, - aPrevInFlow->Type() == LayoutFrameType::Image && + aPrevInFlow->Type() == Type() && static_cast(aPrevInFlow)->mKind == mKind); nsAtomicContainerFrame::Init(aContent, aParent, aPrevInFlow);