Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#77394 incorrect handling of empty text nodes

Browse Source 
r=waterson, sr=attinasi
This commit is contained in:
shanjian%netscape.com 2001-07-09 20:47:58 +00:00
parent 4d9cf22b70
commit 49936baba8
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsTextFrame.cpp
View File

@ -5381,7 +5381,15 @@ nsTextFrame::ComputeWordFragmentWidth(nsIPresContext* aPresContext,
PRBool isWhitespace, wasTransformed;
PRInt32 wordLen, contentLen;
PRUnichar* bp = tx.GetNextWord(PR_TRUE, &wordLen, &contentLen, &isWhitespace, &wasTransformed);
if (!bp || isWhitespace) {
if (!bp) {
//empty text node, but we need to continue lookahead measurement
// AND we need to remember the text frame for later so that we don't
// bother doing the word look ahead.
aLineLayout.RecordWordFrame(aTextFrame);
return 0;
}
if (isWhitespace) {
// Don't bother measuring nothing
*aStop = PR_TRUE;
return 0;

10
layout/html/base/src/nsTextFrame.cpp
View File

@ -5381,7 +5381,15 @@ nsTextFrame::ComputeWordFragmentWidth(nsIPresContext* aPresContext,
PRBool isWhitespace, wasTransformed;
PRInt32 wordLen, contentLen;
PRUnichar* bp = tx.GetNextWord(PR_TRUE, &wordLen, &contentLen, &isWhitespace, &wasTransformed);
if (!bp || isWhitespace) {
if (!bp) {
//empty text node, but we need to continue lookahead measurement
// AND we need to remember the text frame for later so that we don't
// bother doing the word look ahead.
aLineLayout.RecordWordFrame(aTextFrame);
return 0;
}
if (isWhitespace) {
// Don't bother measuring nothing
*aStop = PR_TRUE;
return 0;