From 420514189477680cf647054810f3fb854ff7ac9c Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Wed, 28 May 2014 19:36:59 +0000 Subject: [PATCH] Bug 1015781 - part 10, Make nsHTMLButtonControlFrame::AppendFrames/InsertFrames/RemoveFrame DEBUG only. r=roc --- layout/forms/nsHTMLButtonControlFrame.cpp | 10 ++++++---- layout/forms/nsHTMLButtonControlFrame.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp index dcbad2247b7c..620a595795de 100644 --- a/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/layout/forms/nsHTMLButtonControlFrame.cpp @@ -373,11 +373,12 @@ nsHTMLButtonControlFrame::SetAdditionalStyleContext(int32_t aIndex, mRenderer.SetStyleContext(aIndex, aStyleContext); } -void +#ifdef DEBUG +void nsHTMLButtonControlFrame::AppendFrames(ChildListID aListID, nsFrameList& aFrameList) { - NS_NOTREACHED("unsupported operation"); + MOZ_CRASH("unsupported operation"); } void @@ -385,12 +386,13 @@ nsHTMLButtonControlFrame::InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) { - NS_NOTREACHED("unsupported operation"); + MOZ_CRASH("unsupported operation"); } void nsHTMLButtonControlFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) { - NS_NOTREACHED("unsupported operation"); + MOZ_CRASH("unsupported operation"); } +#endif diff --git a/layout/forms/nsHTMLButtonControlFrame.h b/layout/forms/nsHTMLButtonControlFrame.h index b7289847b260..9b5ff920853c 100644 --- a/layout/forms/nsHTMLButtonControlFrame.h +++ b/layout/forms/nsHTMLButtonControlFrame.h @@ -51,15 +51,15 @@ public: virtual void SetAdditionalStyleContext(int32_t aIndex, nsStyleContext* aStyleContext) MOZ_OVERRIDE; +#ifdef DEBUG virtual void AppendFrames(ChildListID aListID, nsFrameList& aFrameList) MOZ_OVERRIDE; - virtual void InsertFrames(ChildListID aListID, nsIFrame* aPrevFrame, nsFrameList& aFrameList) MOZ_OVERRIDE; - virtual void RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame) MOZ_OVERRIDE; +#endif #ifdef ACCESSIBILITY virtual mozilla::a11y::AccType AccessibleType() MOZ_OVERRIDE;