From 974ca5815549c522e1752761e4687e755939e252 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 6 Mar 2015 16:33:30 -0500 Subject: [PATCH] Bug 1140216. Remove asserts that stuff that we never create is not null, since it clearly is null. r=jwatt --- layout/forms/crashtests/1140216.html | 20 ++++++++++++++++++++ layout/forms/crashtests/crashtests.list | 1 + layout/forms/nsNumberControlFrame.cpp | 6 +++--- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 layout/forms/crashtests/1140216.html diff --git a/layout/forms/crashtests/1140216.html b/layout/forms/crashtests/1140216.html new file mode 100644 index 00000000000..72612b8b3c0 --- /dev/null +++ b/layout/forms/crashtests/1140216.html @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/layout/forms/crashtests/crashtests.list b/layout/forms/crashtests/crashtests.list index 87cfa6df53b..b681da77650 100644 --- a/layout/forms/crashtests/crashtests.list +++ b/layout/forms/crashtests/crashtests.list @@ -60,3 +60,4 @@ load 949891.xhtml load 959311.html load 960277-2.html load 1102791.html +load 1140216.html diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index 11aea21751b..5fe2ef41a9b 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -805,17 +805,17 @@ nsNumberControlFrame::GetPseudoElement(nsCSSPseudoElements::Type aType) } if (aType == nsCSSPseudoElements::ePseudo_mozNumberSpinBox) { - MOZ_ASSERT(mSpinBox); + // Might be null. return mSpinBox; } if (aType == nsCSSPseudoElements::ePseudo_mozNumberSpinUp) { - MOZ_ASSERT(mSpinUp); + // Might be null. return mSpinUp; } if (aType == nsCSSPseudoElements::ePseudo_mozNumberSpinDown) { - MOZ_ASSERT(mSpinDown); + // Might be null. return mSpinDown; }