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

Null checks for non-reproducable crash: b=108105 ...

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@109904 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
attinasi%netscape.com
2001-12-07 00:03:48 +00:00
parent ba496b391d
commit 58e14b05c5
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -534,6 +534,7 @@ public:
// Cache the original decorations and reuse the current font
// to query metrics, rather than creating a new font which is expensive.
nsFont* plainFont = (nsFont *)&mFont->mFont; //XXX: Change to use a CONST_CAST macro.
NS_ASSERTION(plainFont, "null plainFont: font problems in TextStyle::TextStyle");
PRUint8 originalDecorations = plainFont->decorations;
plainFont->decorations = NS_FONT_DECORATION_NONE;
nsCOMPtr<nsIDeviceContext> deviceContext;
@@ -542,13 +543,16 @@ public:
if (mVisibility->mLanguage) {
mVisibility->mLanguage->GetLanguageGroup(getter_AddRefs(langGroup));
}
deviceContext->GetMetricsFor(*plainFont, langGroup, mNormalFont);
aRenderingContext.SetFont(mNormalFont); // some users of the struct expect this state
mNormalFont->GetSpaceWidth(mSpaceWidth);
mAveCharWidth = 0;
deviceContext->GetMetricsFor(*plainFont, langGroup, mNormalFont);
NS_ASSERTION(mNormalFont, "null normal font cannot be handled");
if (mNormalFont) {
aRenderingContext.SetFont(mNormalFont); // some users of the struct expect this state
mNormalFont->GetSpaceWidth(mSpaceWidth);
#if defined(_WIN32) || defined(XP_OS2)
mNormalFont->GetAveCharWidth(mAveCharWidth);
mNormalFont->GetAveCharWidth(mAveCharWidth);
#endif
}
if (0 == mAveCharWidth) {
// provide a default if it could not be resolved
mAveCharWidth = 10;

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

@@ -534,6 +534,7 @@ public:
// Cache the original decorations and reuse the current font
// to query metrics, rather than creating a new font which is expensive.
nsFont* plainFont = (nsFont *)&mFont->mFont; //XXX: Change to use a CONST_CAST macro.
NS_ASSERTION(plainFont, "null plainFont: font problems in TextStyle::TextStyle");
PRUint8 originalDecorations = plainFont->decorations;
plainFont->decorations = NS_FONT_DECORATION_NONE;
nsCOMPtr<nsIDeviceContext> deviceContext;
@@ -542,13 +543,16 @@ public:
if (mVisibility->mLanguage) {
mVisibility->mLanguage->GetLanguageGroup(getter_AddRefs(langGroup));
}
deviceContext->GetMetricsFor(*plainFont, langGroup, mNormalFont);
aRenderingContext.SetFont(mNormalFont); // some users of the struct expect this state
mNormalFont->GetSpaceWidth(mSpaceWidth);
mAveCharWidth = 0;
deviceContext->GetMetricsFor(*plainFont, langGroup, mNormalFont);
NS_ASSERTION(mNormalFont, "null normal font cannot be handled");
if (mNormalFont) {
aRenderingContext.SetFont(mNormalFont); // some users of the struct expect this state
mNormalFont->GetSpaceWidth(mSpaceWidth);
#if defined(_WIN32) || defined(XP_OS2)
mNormalFont->GetAveCharWidth(mAveCharWidth);
mNormalFont->GetAveCharWidth(mAveCharWidth);
#endif
}
if (0 == mAveCharWidth) {
// provide a default if it could not be resolved
mAveCharWidth = 10;