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

bad infiniteloop fix

Browse Source
This commit is contained in:
mjudge@netscape.com
2000-05-05 02:38:03 +00:00
parent 2e2b1032f0
commit df6ffaef47
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
layout/generic/nsFrame.cpp
View File

@@ -1925,13 +1925,12 @@ nsFrame::GetSelectionController(nsIPresContext *aPresContext, nsISelectionContro
if (state & NS_FRAME_INDEPENDENT_SELECTION)
{
nsIFrame *tmp = this;
nsIFrame *parent;
while ( NS_SUCCEEDED(tmp->GetParent(&parent)) && parent)
while ( NS_SUCCEEDED(tmp->GetParent(&tmp)) && tmp)
{
parent->GetFrameState(&state);
tmp->GetFrameState(&state);
if (! (state & NS_FRAME_INDEPENDENT_SELECTION)) //we have found the nsGfx*
{
nsFrame* castParent = NS_STATIC_CAST(nsFrame *,parent);
nsFrame* castParent = NS_STATIC_CAST(nsFrame *,tmp);
return castParent->GetSelectionController(aPresContext, aSelCon);
}
}

7
layout/html/base/src/nsFrame.cpp
View File

@@ -1925,13 +1925,12 @@ nsFrame::GetSelectionController(nsIPresContext *aPresContext, nsISelectionContro
if (state & NS_FRAME_INDEPENDENT_SELECTION)
{
nsIFrame *tmp = this;
nsIFrame *parent;
while ( NS_SUCCEEDED(tmp->GetParent(&parent)) && parent)
while ( NS_SUCCEEDED(tmp->GetParent(&tmp)) && tmp)
{
parent->GetFrameState(&state);
tmp->GetFrameState(&state);
if (! (state & NS_FRAME_INDEPENDENT_SELECTION)) //we have found the nsGfx*
{
nsFrame* castParent = NS_STATIC_CAST(nsFrame *,parent);
nsFrame* castParent = NS_STATIC_CAST(nsFrame *,tmp);
return castParent->GetSelectionController(aPresContext, aSelCon);
}
}