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

Safety checks, in case the normalFont cannot be realized (due to system font exhaustion). b=117736 r=rbs sr=shaver a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@115334 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com 2002-02-26 00:13:49 +00:00
parent 300dcaff19
commit a83bd3ab92
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsTextFrame.cpp
View File

@ -634,7 +634,7 @@ public:
}
~TextStyle() {
NS_RELEASE(mNormalFont);
NS_IF_RELEASE(mNormalFont);
NS_IF_RELEASE(mSmallFont);
mFont = nsnull;
@ -4558,8 +4558,18 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext,
aTextData.mX = 0;
if (aTextData.mMeasureText) {
aTs.mNormalFont->GetMaxAscent(aTextData.mAscent);
aTs.mNormalFont->GetMaxDescent(aTextData.mDescent);
// NOTE: in some cases, when font resources are exhausted, we end up with no normal font.
// This will cause a crash because we are not handling it at the source and everyplace else
// assumes the normal font is non-null.
// This bit of ASSERTION / Runtime checking is to prevent the crash, but is only wallpaper.
// We need to handle the problem when the font is being realized - currently that just throws
// an assertion and we continue on.
// See bug 117736
NS_ASSERTION(aTs.mNormalFont, "null normal font, probably ran out of font resources");
if (aTs.mNormalFont) {
aTs.mNormalFont->GetMaxAscent(aTextData.mAscent);
aTs.mNormalFont->GetMaxDescent(aTextData.mDescent);
}
}
for (;;firstThing = PR_FALSE) {
#ifdef IBMBIDI

16
mozilla/layout/html/base/src/nsTextFrame.cpp
View File

@ -634,7 +634,7 @@ public:
}
~TextStyle() {
NS_RELEASE(mNormalFont);
NS_IF_RELEASE(mNormalFont);
NS_IF_RELEASE(mSmallFont);
mFont = nsnull;
@ -4558,8 +4558,18 @@ nsTextFrame::MeasureText(nsIPresContext* aPresContext,
aTextData.mX = 0;
if (aTextData.mMeasureText) {
aTs.mNormalFont->GetMaxAscent(aTextData.mAscent);
aTs.mNormalFont->GetMaxDescent(aTextData.mDescent);
// NOTE: in some cases, when font resources are exhausted, we end up with no normal font.
// This will cause a crash because we are not handling it at the source and everyplace else
// assumes the normal font is non-null.
// This bit of ASSERTION / Runtime checking is to prevent the crash, but is only wallpaper.
// We need to handle the problem when the font is being realized - currently that just throws
// an assertion and we continue on.
// See bug 117736
NS_ASSERTION(aTs.mNormalFont, "null normal font, probably ran out of font resources");
if (aTs.mNormalFont) {
aTs.mNormalFont->GetMaxAscent(aTextData.mAscent);
aTs.mNormalFont->GetMaxDescent(aTextData.mDescent);
}
}
for (;;firstThing = PR_FALSE) {
#ifdef IBMBIDI