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

NPOTB. Add missing rendering context null-checks. b=380502 r+sr=roc

Browse Source
This commit is contained in:
mats.palmgren@bredband.net 2007-05-17 03:52:20 -07:00
parent 00e4fdb689
commit 71ab3fc250
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
layout/generic/nsTextFrameThebes.cpp
View File

@ -1215,6 +1215,9 @@ GetFontGroupForFrame(nsIFrame* aFrame)
static gfxTextRun*
GetHyphenTextRun(gfxTextRun* aTextRun, nsIRenderingContext* aRefContext)
{
if (NS_UNLIKELY(!aRefContext)) {
return nsnull;
}
gfxContext* ctx = NS_STATIC_CAST(gfxContext*,
aRefContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
gfxFontGroup* fontGroup = aTextRun->GetFontGroup();
@ -1639,8 +1642,10 @@ nsTextFrame::EnsureTextRun(nsIRenderingContext* aRC, nsBlockFrame* aBlock,
}
} else {
nsCOMPtr<nsIRenderingContext> rendContext =
GetReferenceRenderingContext(this, aRC);
BuildTextRuns(rendContext, this, aBlock, aLine);
GetReferenceRenderingContext(this, aRC);
if (rendContext) {
BuildTextRuns(rendContext, this, aBlock, aLine);
}
if (!mTextRun) {
// A text run was not constructed for this frame. This is bad. The caller
// will check mTextRun.
@ -4843,8 +4848,10 @@ nsTextFrame::Reflow(nsPresContext* aPresContext,
if (usedHyphenation) {
// Fix up metrics to include hyphen
gfxTextRun* hyphenTextRun = GetHyphenTextRun(mTextRun, aReflowState.rendContext);
AddCharToMetrics(hyphenTextRun,
mTextRun, &textMetrics, needTightBoundingBox);
if (hyphenTextRun) {
AddCharToMetrics(hyphenTextRun,
mTextRun, &textMetrics, needTightBoundingBox);
}
AddStateBits(TEXT_HYPHEN_BREAK);
}