Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 54005. Test if frame CanContinueTextRun() before advancing to its sibling. r=karnaze, a=buster

Browse Source
This commit is contained in:
waterson%netscape.com 2000-10-09 22:03:03 +00:00
parent 4b12cfdd46
commit 072a02200b
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/generic/nsLineLayout.cpp
View File

@ -2988,21 +2988,23 @@ nsLineLayout::FindNextText(nsIPresContext* aPresContext, nsIFrame* aFrame)
PRInt32 lastIndex = count - 1;
nsIFrame* top = NS_STATIC_CAST(nsIFrame*, stack.ElementAt(lastIndex));
// If this is a frame that'll break a word, then bail.
PRBool canContinue;
top->CanContinueTextRun(canContinue);
if (! canContinue)
break;
// Advance to top's next sibling
nsIFrame* next;
top->GetNextSibling(&next);
if (! next) {
// No next. Pop the top element.
// No more siblings. Pop the top element to walk back up the
// frame tree.
stack.RemoveElementAt(lastIndex);
continue;
}
// If this is a frame that'll break a word, then bail.
PRBool canContinue;
next->CanContinueTextRun(canContinue);
if (! canContinue)
break;
// We know top's parent is good, but next's might not be. So let's
// set it to be sure.
nsIFrame* parent;

16
layout/html/base/src/nsLineLayout.cpp
View File

@ -2988,21 +2988,23 @@ nsLineLayout::FindNextText(nsIPresContext* aPresContext, nsIFrame* aFrame)
PRInt32 lastIndex = count - 1;
nsIFrame* top = NS_STATIC_CAST(nsIFrame*, stack.ElementAt(lastIndex));
// If this is a frame that'll break a word, then bail.
PRBool canContinue;
top->CanContinueTextRun(canContinue);
if (! canContinue)
break;
// Advance to top's next sibling
nsIFrame* next;
top->GetNextSibling(&next);
if (! next) {
// No next. Pop the top element.
// No more siblings. Pop the top element to walk back up the
// frame tree.
stack.RemoveElementAt(lastIndex);
continue;
}
// If this is a frame that'll break a word, then bail.
PRBool canContinue;
next->CanContinueTextRun(canContinue);
if (! canContinue)
break;
// We know top's parent is good, but next's might not be. So let's
// set it to be sure.
nsIFrame* parent;