corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1173858 - Part 2: Use LAYOUT_WARN_IF_FALSE to silence some verbose layout warnings by default. r=dholbert

Browse Source
This commit is contained in:
Eric Rahm
2015-06-15 16:36:11 -07:00
parent cf771fcda0
commit 22de9808e0
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsHTMLReflowState.cpp
View File

@@ -7,6 +7,7 @@
#include "nsHTMLReflowState.h"
#include "LayoutLogging.h"
#include "nsStyleConsts.h"
#include "nsCSSAnonBoxes.h"
#include "nsFrame.h"
@@ -357,7 +358,7 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
}
}
NS_WARN_IF_FALSE(AvailableISize() != NS_UNCONSTRAINEDSIZE,
LAYOUT_WARN_IF_FALSE(AvailableISize() != NS_UNCONSTRAINEDSIZE,
"have unconstrained inline-size; this should only result from "
"very large sizes, not attempts at intrinsic inline-size "
"calculation");
@@ -446,7 +447,7 @@ nsHTMLReflowState::Init(nsPresContext* aPresContext,
AvailableBSize() = NS_UNCONSTRAINEDSIZE;
}
NS_WARN_IF_FALSE((mFrameType == NS_CSS_FRAME_TYPE_INLINE &&
LAYOUT_WARN_IF_FALSE((mFrameType == NS_CSS_FRAME_TYPE_INLINE &&
!frame->IsFrameOfType(nsIFrame::eReplaced)) ||
type == nsGkAtoms::textFrame ||
ComputedISize() != NS_UNCONSTRAINEDSIZE,
@@ -2453,7 +2454,7 @@ nsHTMLReflowState::CalculateBlockSideMargins(nsIAtom* aFrameType)
computedISizeCBWM = availISizeCBWM;
}
NS_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != computedISizeCBWM &&
LAYOUT_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != computedISizeCBWM &&
NS_UNCONSTRAINEDSIZE != availISizeCBWM,
"have unconstrained inline-size; this should only result from "
"very large sizes, not attempts at intrinsic inline-size "