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

Don't call CalculateContentBottom inside PR_MAX(), which evaluates its arguments twice. (Bug 511482) r=dbaron a1.9.0.15=dveditz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@258320 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mats.palmgren%bredband.net 2009-09-04 20:41:56 +00:00
parent c690eb5bca
commit 34c9000324
3 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/base/nsLayoutUtils.cpp
View File

@ -2423,11 +2423,11 @@ CalculateBlockContentBottom(nsBlockFrame* aFrame)
if (line->IsBlock()) { if (line->IsBlock()) {
nsIFrame* child = line->mFirstChild; nsIFrame* child = line->mFirstChild;
nscoord offset = child->GetRect().y - child->GetRelativeOffset().y; nscoord offset = child->GetRect().y - child->GetRelativeOffset().y;
contentBottom = PR_MAX(contentBottom, contentBottom = NS_MAX(contentBottom,
nsLayoutUtils::CalculateContentBottom(child) + offset); nsLayoutUtils::CalculateContentBottom(child) + offset);
} }
else { else {
contentBottom = PR_MAX(contentBottom, line->mBounds.YMost()); contentBottom = NS_MAX(contentBottom, line->mBounds.YMost());
} }
} }
return contentBottom; return contentBottom;
@ -2446,7 +2446,7 @@ nsLayoutUtils::CalculateContentBottom(nsIFrame* aFrame)
PRIntn nextListID = 0; PRIntn nextListID = 0;
do { do {
if (childList == nsnull && blockFrame) { if (childList == nsnull && blockFrame) {
contentBottom = PR_MAX(contentBottom, CalculateBlockContentBottom(blockFrame)); contentBottom = NS_MAX(contentBottom, CalculateBlockContentBottom(blockFrame));
} }
else if (childList != nsGkAtoms::overflowList && else if (childList != nsGkAtoms::overflowList &&
childList != nsGkAtoms::excessOverflowContainersList && childList != nsGkAtoms::excessOverflowContainersList &&
@ -2456,7 +2456,7 @@ nsLayoutUtils::CalculateContentBottom(nsIFrame* aFrame)
child; child = child->GetNextSibling()) child; child = child->GetNextSibling())
{ {
nscoord offset = child->GetRect().y - child->GetRelativeOffset().y; nscoord offset = child->GetRect().y - child->GetRelativeOffset().y;
contentBottom = PR_MAX(contentBottom, contentBottom = NS_MAX(contentBottom,
CalculateContentBottom(child) + offset); CalculateContentBottom(child) + offset);
} }
} }

42
mozilla/layout/generic/crashtests/511482.html Normal file
View File

@ -0,0 +1,42 @@
<html>
<body>
<div style="border: 5px solid blue;">
<div style="-moz-column-width: 530px;height:300px; border: 5px solid red;">
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
<div style="width:128px; height:128px;border: 5px solid green" >
</div>
</div>
</body>
</html>

1
mozilla/layout/generic/crashtests/crashtests.list
View File

@ -147,3 +147,4 @@ load 445288.html
load 472776-1.html load 472776-1.html
load 472950-1.html load 472950-1.html
load 477928.html load 477928.html
load 511482.html