Bug 1287743 - assign |blank| outside of the assert. r?dholbert draft
authorAndi-Bogdan Postelnicu <bpostelnicu@mozilla.com>
Tue, 19 Jul 2016 15:43:08 +0300
changeset 389473 ab473c78c96c0cc44794ca420569b347d9396a22
parent 389281 feaaf1af1065257b9178faca8b67eed9657b4a17
child 525768 1989df84ceb3fbccae1ba23d6725eb60b32705ee
push id23423
push userbmo:bpostelnicu@mozilla.com
push dateTue, 19 Jul 2016 12:43:31 +0000
reviewersdholbert
bugs1287743
milestone50.0a1
Bug 1287743 - assign |blank| outside of the assert. r?dholbert MozReview-Commit-ID: IsHZeFsGGJC
layout/generic/nsFrameSetFrame.cpp
--- a/layout/generic/nsFrameSetFrame.cpp
+++ b/layout/generic/nsFrameSetFrame.cpp
@@ -974,17 +974,18 @@ nsHTMLFramesetFrame::Reflow(nsPresContex
           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");
+        blank = do_QueryFrame(child);
+        MOZ_ASSERT(blank, "unexpected child frame type");
         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);
         }