wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 483439 - text with stroke and fill causes crashes. r+sr=roc

Browse Source
This commit is contained in:
Robert Longson 2009-03-16 11:59:23 +00:00
parent 944580803e
commit cd32c05a9c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/svg/base/src/nsSVGGlyphFrame.cpp
View File

@ -449,11 +449,11 @@ nsSVGGlyphFrame::UpdateCoveredRegion()
nsRefPtr<gfxContext> tmpCtx = MakeTmpCtx(); nsRefPtr<gfxContext> tmpCtx = MakeTmpCtx();
SetMatrixPropagation(PR_FALSE); SetMatrixPropagation(PR_FALSE);
CharacterIterator iter(this, PR_TRUE);
gfxRect extent = gfxRect(0, 0, 0, 0); gfxRect extent = gfxRect(0, 0, 0, 0);
if (SetupCairoStrokeGeometry(tmpCtx)) { if (SetupCairoStrokeGeometry(tmpCtx)) {
CharacterIterator iter(this, PR_TRUE);
gfxFloat strokeWidth = tmpCtx->CurrentLineWidth(); gfxFloat strokeWidth = tmpCtx->CurrentLineWidth();
AddCharactersToPath(&iter, tmpCtx); AddCharactersToPath(&iter, tmpCtx);
tmpCtx->SetLineWidth(strokeWidth); tmpCtx->SetLineWidth(strokeWidth);
@ -461,6 +461,7 @@ nsSVGGlyphFrame::UpdateCoveredRegion()
extent = tmpCtx->GetUserStrokeExtent(); extent = tmpCtx->GetUserStrokeExtent();
} }
if (GetStyleSVG()->mFill.mType != eStyleSVGPaintType_None) { if (GetStyleSVG()->mFill.mType != eStyleSVGPaintType_None) {
CharacterIterator iter(this, PR_TRUE);
AddBoundingBoxesToPath(&iter, tmpCtx); AddBoundingBoxesToPath(&iter, tmpCtx);
tmpCtx->IdentityMatrix(); tmpCtx->IdentityMatrix();
extent = extent.Union(tmpCtx->GetUserPathExtent()); extent = extent.Union(tmpCtx->GetUserPathExtent());