Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 154979 - use gNoisyMaxElementSize instead of NOISY_MAX_ELEMENTSIZE r=karnaze sr=waterson

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@124405 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bernd.mielke%snafu.de
2002-07-01 17:43:02 +00:00
parent 12d81dd955
commit c67e5d2a21
8 changed files with 248 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/layout/html/base/src/nsLineLayout.cpp
View File

@@ -1259,15 +1259,18 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
}
}
#endif
#ifdef NOISY_MAX_ELEMENT_SIZE
if (!NS_INLINE_IS_BREAK_BEFORE(aReflowStatus)) {
if (mComputeMaxElementSize) {
printf(" ");
nsFrame::ListTag(stdout, aFrame);
printf(": maxElementSize=%d,%d wh=%d,%d,\n",
metrics.maxElementSize->width,
metrics.maxElementSize->height,
metrics.width, metrics.height);
#ifdef DEBUG
if (nsBlockFrame::gNoisyMaxElementSize) {
nsFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent);
if (!NS_INLINE_IS_BREAK_BEFORE(aReflowStatus)) {
if (mComputeMaxElementSize) {
printf(" ");
nsFrame::ListTag(stdout, aFrame);
printf(": maxElementSize=%d,%d wh=%d,%d,\n",
metrics.maxElementSize->width,
metrics.maxElementSize->height,
metrics.width, metrics.height);
}
}
}
#endif
@@ -1937,7 +1940,7 @@ nsLineLayout::VerticalAlignLine(nsLineBox* aLineBox,
PRBool strictMode = InStrictMode();
PRBool inUnconstrainedTable = InUnconstrainedTableCell(*mBlockReflowState);
#endif
#ifdef NOISY_MAX_ELEMENT_SIZE
#ifdef DEBUG
int frameCount = 0;
#endif
@@ -1961,7 +1964,8 @@ nsLineLayout::VerticalAlignLine(nsLineBox* aLineBox,
#ifdef HACK_MEW
#ifdef NOISY_MAX_ELEMENT_SIZE
#ifdef DEBUG
if (nsBlockFrame::gNoisyMaxElementSize)
frameCount++;
#endif
// if in Quirks mode and in a table cell with an unconstrained width, then emulate an IE
@@ -1988,9 +1992,12 @@ nsLineLayout::VerticalAlignLine(nsLineBox* aLineBox,
// now update the prevFrame
prevFrameAccumulates = curFrameAccumulates;
#ifdef NOISY_MAX_ELEMENT_SIZE
printf("(%d) last frame's MEW=%d | Accumulated MEW=%d\n", frameCount, mw, accumulatedWidth);
#endif // NOISY_MAX_ELEMENT_SIZE
#ifdef DEBUG
if (nsBlockFrame::gNoisyMaxElementSize) {
nsFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent);
printf("(%d) last frame's MEW=%d | Accumulated MEW=%d\n", frameCount, mw, accumulatedWidth);
}
#endif
mw = accumulatedWidth;
}