diff options
Diffstat (limited to '')
| -rw-r--r-- | layout/generic/nsCanvasFrame.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp index 64c56b1c00..b4b108905f 100644 --- a/layout/generic/nsCanvasFrame.cpp +++ b/layout/generic/nsCanvasFrame.cpp @@ -606,24 +606,16 @@ void nsCanvasFrame::PaintFocus(DrawTarget* aDrawTarget, nsPoint aPt) { /* virtual */ nscoord nsCanvasFrame::GetMinISize(gfxContext* aRenderingContext) { - nscoord result; - DISPLAY_MIN_INLINE_SIZE(this, result); - if (mFrames.IsEmpty()) - result = 0; - else - result = mFrames.FirstChild()->GetMinISize(aRenderingContext); - return result; + return mFrames.IsEmpty() + ? 0 + : mFrames.FirstChild()->GetMinISize(aRenderingContext); } /* virtual */ nscoord nsCanvasFrame::GetPrefISize(gfxContext* aRenderingContext) { - nscoord result; - DISPLAY_PREF_INLINE_SIZE(this, result); - if (mFrames.IsEmpty()) - result = 0; - else - result = mFrames.FirstChild()->GetPrefISize(aRenderingContext); - return result; + return mFrames.IsEmpty() + ? 0 + : mFrames.FirstChild()->GetPrefISize(aRenderingContext); } void nsCanvasFrame::Reflow(nsPresContext* aPresContext, @@ -632,7 +624,6 @@ void nsCanvasFrame::Reflow(nsPresContext* aPresContext, nsReflowStatus& aStatus) { MarkInReflow(); DO_GLOBAL_REFLOW_COUNT("nsCanvasFrame"); - DISPLAY_REFLOW(aPresContext, this, aReflowInput, aDesiredSize, aStatus); MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!"); NS_FRAME_TRACE_REFLOW_IN("nsCanvasFrame::Reflow"); |