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

Fixed infinite loop in GetStyleSize code

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@2499 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp 1998-05-28 17:06:43 +00:00
parent 03f29947f5
commit 3bcb8b4996
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/content/html/style/src/nsCSSLayout.cpp
View File

@ -300,6 +300,7 @@ GetStyleDimension(nsIPresContext* aPresContext,
// on the containing block's <B>width</B>.
// XXX need to subtract out padding, also this needs
// to be synced with nsFrame's IsPercentageBase
// XXX should this be geometric parent
aFrame->GetContentParent(parentFrame);
while (nsnull != parentFrame) {
nsBlockFrame* block;
@ -312,6 +313,7 @@ GetStyleDimension(nsIPresContext* aPresContext,
rv = PR_TRUE;
break;
}
parentFrame->GetContentParent(parentFrame);
}
break;
default:
@ -336,8 +338,8 @@ nsCSSLayout::GetStyleSize(nsIPresContext* aPresContext,
nsIStyleContext* sc = nsnull;
aFrame->GetStyleContext(aPresContext, sc);
if (nsnull != sc) {
nsStylePosition* pos = (nsStylePosition*
) sc->GetData(eStyleStruct_Position);
nsStylePosition* pos = (nsStylePosition*)
sc->GetData(eStyleStruct_Position);
if (GetStyleDimension(aPresContext, aFrame, pos, pos->mWidth,
aStyleSize.width)) {
rv |= NS_SIZE_HAS_WIDTH;

6
mozilla/layout/html/style/src/nsCSSLayout.cpp
View File

@ -300,6 +300,7 @@ GetStyleDimension(nsIPresContext* aPresContext,
// on the containing block's <B>width</B>.
// XXX need to subtract out padding, also this needs
// to be synced with nsFrame's IsPercentageBase
// XXX should this be geometric parent
aFrame->GetContentParent(parentFrame);
while (nsnull != parentFrame) {
nsBlockFrame* block;
@ -312,6 +313,7 @@ GetStyleDimension(nsIPresContext* aPresContext,
rv = PR_TRUE;
break;
}
parentFrame->GetContentParent(parentFrame);
}
break;
default:
@ -336,8 +338,8 @@ nsCSSLayout::GetStyleSize(nsIPresContext* aPresContext,
nsIStyleContext* sc = nsnull;
aFrame->GetStyleContext(aPresContext, sc);
if (nsnull != sc) {
nsStylePosition* pos = (nsStylePosition*
) sc->GetData(eStyleStruct_Position);
nsStylePosition* pos = (nsStylePosition*)
sc->GetData(eStyleStruct_Position);
if (GetStyleDimension(aPresContext, aFrame, pos, pos->mWidth,
aStyleSize.width)) {
rv |= NS_SIZE_HAS_WIDTH;