Bug 1287743 - Shift an assignment to be outside of an assert, in nsFrameSetFrame, to address a static-analysis issue. r?dholbert
MozReview-Commit-ID: IsHZeFsGGJC
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -973,18 +973,20 @@ nsHTMLFramesetFrame::Reflow(nsPresContex
if (eFrameborder_Yes == mChildFrameborder[childX]) {
childVis = ALL_VIS;
} else if (eFrameborder_No == mChildFrameborder[childX]) {
childVis = NONE_VIS;
} else { // notset
childVis = (eFrameborder_No == frameborder) ? NONE_VIS : ALL_VIS;
}
} else { // blank
- DebugOnly<nsHTMLFramesetBlankFrame*> blank;
- MOZ_ASSERT(blank = do_QueryFrame(child), "unexpected child frame type");
+#ifdef DEBUG
+ nsHTMLFramesetBlankFrame* blank = do_QueryFrame(child);
+ MOZ_ASSERT(blank, "unexpected child frame type");
+#endif
childVis = NONE_VIS;
}
nsBorderColor childColors = mChildBorderColors[childX];
// set the visibility, color of our edge borders based on children
if (0 == cellIndex.x) {
if (!(mEdgeVisibility & LEFT_VIS)) {
mEdgeVisibility |= (LEFT_VIS & childVis);
}