Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-09 14:28:25 +00:00
Code Issues 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 c30da52a01
commit 450040c157
2 changed files with 6 additions and 8 deletions
Show Stats 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) if (state & NS_FRAME_INDEPENDENT_SELECTION)
{ {
nsIFrame *tmp = this; nsIFrame *tmp = this;
nsIFrame *parent; while ( NS_SUCCEEDED(tmp->GetParent(&tmp)) && tmp)
while ( NS_SUCCEEDED(tmp->GetParent(&parent)) && parent)
{ {
parent->GetFrameState(&state); tmp->GetFrameState(&state);
if (! (state & NS_FRAME_INDEPENDENT_SELECTION)) //we have found the nsGfx* 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); 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) if (state & NS_FRAME_INDEPENDENT_SELECTION)
{ {
nsIFrame *tmp = this; nsIFrame *tmp = this;
nsIFrame *parent; while ( NS_SUCCEEDED(tmp->GetParent(&tmp)) && tmp)
while ( NS_SUCCEEDED(tmp->GetParent(&parent)) && parent)
{ {
parent->GetFrameState(&state); tmp->GetFrameState(&state);
if (! (state & NS_FRAME_INDEPENDENT_SELECTION)) //we have found the nsGfx* 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); return castParent->GetSelectionController(aPresContext, aSelCon);
} }
} }