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

Fixed infinite loop 12747

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@46620 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com 1999-09-09 20:53:32 +00:00
parent 60cdd0ecd9
commit a7c9ed1bc5
6 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/layout/generic/nsBlockFrame.cpp
View File

@ -536,6 +536,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
}
mMinLineHeight = nsHTMLReflowState::CalcLineHeight(*mPresContext,
aReflowState.rendContext,
aReflowState.frame);
}
@ -1406,14 +1407,16 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
static PRBool
HaveAutoWidth(const nsHTMLReflowState& aReflowState)
{
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = aReflowState.mStylePosition;
if (!pos) {
const nsHTMLReflowState* rs = &aReflowState;
if (NS_UNCONSTRAINEDSIZE == rs->mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = rs->mStylePosition;
for (;;) {
if (!pos) {
return PR_TRUE;
}
nsStyleUnit widthUnit = pos->mWidth.GetUnit();
if (eStyleUnit_Auto == widthUnit) {
return PR_TRUE;
@ -1422,15 +1425,14 @@ HaveAutoWidth(const nsHTMLReflowState& aReflowState)
break;
}
const nsHTMLReflowState* prs = (const nsHTMLReflowState*)
aReflowState.parentReflowState;
rs->parentReflowState;
if (!prs) {
return PR_TRUE;
}
rs = prs;
pos = prs->mStylePosition;
if (!pos) {
return PR_TRUE;
}
}
return PR_FALSE;
}

20
mozilla/layout/generic/nsBlockReflowState.cpp
View File

@ -536,6 +536,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
}
mMinLineHeight = nsHTMLReflowState::CalcLineHeight(*mPresContext,
aReflowState.rendContext,
aReflowState.frame);
}
@ -1406,14 +1407,16 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
static PRBool
HaveAutoWidth(const nsHTMLReflowState& aReflowState)
{
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = aReflowState.mStylePosition;
if (!pos) {
const nsHTMLReflowState* rs = &aReflowState;
if (NS_UNCONSTRAINEDSIZE == rs->mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = rs->mStylePosition;
for (;;) {
if (!pos) {
return PR_TRUE;
}
nsStyleUnit widthUnit = pos->mWidth.GetUnit();
if (eStyleUnit_Auto == widthUnit) {
return PR_TRUE;
@ -1422,15 +1425,14 @@ HaveAutoWidth(const nsHTMLReflowState& aReflowState)
break;
}
const nsHTMLReflowState* prs = (const nsHTMLReflowState*)
aReflowState.parentReflowState;
rs->parentReflowState;
if (!prs) {
return PR_TRUE;
}
rs = prs;
pos = prs->mStylePosition;
if (!pos) {
return PR_TRUE;
}
}
return PR_FALSE;
}

20
mozilla/layout/generic/nsBlockReflowState.h
View File

@ -536,6 +536,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
}
mMinLineHeight = nsHTMLReflowState::CalcLineHeight(*mPresContext,
aReflowState.rendContext,
aReflowState.frame);
}
@ -1406,14 +1407,16 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
static PRBool
HaveAutoWidth(const nsHTMLReflowState& aReflowState)
{
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = aReflowState.mStylePosition;
if (!pos) {
const nsHTMLReflowState* rs = &aReflowState;
if (NS_UNCONSTRAINEDSIZE == rs->mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = rs->mStylePosition;
for (;;) {
if (!pos) {
return PR_TRUE;
}
nsStyleUnit widthUnit = pos->mWidth.GetUnit();
if (eStyleUnit_Auto == widthUnit) {
return PR_TRUE;
@ -1422,15 +1425,14 @@ HaveAutoWidth(const nsHTMLReflowState& aReflowState)
break;
}
const nsHTMLReflowState* prs = (const nsHTMLReflowState*)
aReflowState.parentReflowState;
rs->parentReflowState;
if (!prs) {
return PR_TRUE;
}
rs = prs;
pos = prs->mStylePosition;
if (!pos) {
return PR_TRUE;
}
}
return PR_FALSE;
}

20
mozilla/layout/html/base/src/nsBlockFrame.cpp
View File

@ -536,6 +536,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
}
mMinLineHeight = nsHTMLReflowState::CalcLineHeight(*mPresContext,
aReflowState.rendContext,
aReflowState.frame);
}
@ -1406,14 +1407,16 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
static PRBool
HaveAutoWidth(const nsHTMLReflowState& aReflowState)
{
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = aReflowState.mStylePosition;
if (!pos) {
const nsHTMLReflowState* rs = &aReflowState;
if (NS_UNCONSTRAINEDSIZE == rs->mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = rs->mStylePosition;
for (;;) {
if (!pos) {
return PR_TRUE;
}
nsStyleUnit widthUnit = pos->mWidth.GetUnit();
if (eStyleUnit_Auto == widthUnit) {
return PR_TRUE;
@ -1422,15 +1425,14 @@ HaveAutoWidth(const nsHTMLReflowState& aReflowState)
break;
}
const nsHTMLReflowState* prs = (const nsHTMLReflowState*)
aReflowState.parentReflowState;
rs->parentReflowState;
if (!prs) {
return PR_TRUE;
}
rs = prs;
pos = prs->mStylePosition;
if (!pos) {
return PR_TRUE;
}
}
return PR_FALSE;
}

20
mozilla/layout/html/base/src/nsBlockReflowState.cpp
View File

@ -536,6 +536,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
}
mMinLineHeight = nsHTMLReflowState::CalcLineHeight(*mPresContext,
aReflowState.rendContext,
aReflowState.frame);
}
@ -1406,14 +1407,16 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
static PRBool
HaveAutoWidth(const nsHTMLReflowState& aReflowState)
{
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = aReflowState.mStylePosition;
if (!pos) {
const nsHTMLReflowState* rs = &aReflowState;
if (NS_UNCONSTRAINEDSIZE == rs->mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = rs->mStylePosition;
for (;;) {
if (!pos) {
return PR_TRUE;
}
nsStyleUnit widthUnit = pos->mWidth.GetUnit();
if (eStyleUnit_Auto == widthUnit) {
return PR_TRUE;
@ -1422,15 +1425,14 @@ HaveAutoWidth(const nsHTMLReflowState& aReflowState)
break;
}
const nsHTMLReflowState* prs = (const nsHTMLReflowState*)
aReflowState.parentReflowState;
rs->parentReflowState;
if (!prs) {
return PR_TRUE;
}
rs = prs;
pos = prs->mStylePosition;
if (!pos) {
return PR_TRUE;
}
}
return PR_FALSE;
}

20
mozilla/layout/html/base/src/nsBlockReflowState.h
View File

@ -536,6 +536,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
}
mMinLineHeight = nsHTMLReflowState::CalcLineHeight(*mPresContext,
aReflowState.rendContext,
aReflowState.frame);
}
@ -1406,14 +1407,16 @@ nsBlockFrame::Reflow(nsIPresContext& aPresContext,
static PRBool
HaveAutoWidth(const nsHTMLReflowState& aReflowState)
{
if (NS_UNCONSTRAINEDSIZE == aReflowState.mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = aReflowState.mStylePosition;
if (!pos) {
const nsHTMLReflowState* rs = &aReflowState;
if (NS_UNCONSTRAINEDSIZE == rs->mComputedWidth) {
return PR_TRUE;
}
const nsStylePosition* pos = rs->mStylePosition;
for (;;) {
if (!pos) {
return PR_TRUE;
}
nsStyleUnit widthUnit = pos->mWidth.GetUnit();
if (eStyleUnit_Auto == widthUnit) {
return PR_TRUE;
@ -1422,15 +1425,14 @@ HaveAutoWidth(const nsHTMLReflowState& aReflowState)
break;
}
const nsHTMLReflowState* prs = (const nsHTMLReflowState*)
aReflowState.parentReflowState;
rs->parentReflowState;
if (!prs) {
return PR_TRUE;
}
rs = prs;
pos = prs->mStylePosition;
if (!pos) {
return PR_TRUE;
}
}
return PR_FALSE;
}