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

b=406782, double rendering of bullets on wikimo, r+sr=roc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242860 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vladimir%pobox.com 2008-01-10 22:10:38 +00:00
parent ac43977434
commit f3e0041e79
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/layout/base/nsCSSRendering.cpp
View File

@ -4403,10 +4403,24 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
aStyle == NS_STYLE_BORDER_STYLE_NONE)
return;
if (aDecoration != NS_STYLE_TEXT_DECORATION_UNDERLINE &&
aDecoration != NS_STYLE_TEXT_DECORATION_OVERLINE &&
aDecoration != NS_STYLE_TEXT_DECORATION_LINE_THROUGH)
{
NS_ERROR("Invalid decoration value!");
return;
}
PRBool contextIsSaved = PR_FALSE;
gfxFloat totalHeight = aLineSize.height;
gfxFloat oldLineWidth;
nsRefPtr<gfxPattern> oldPattern;
switch (aStyle) {
case NS_STYLE_BORDER_STYLE_SOLID:
oldLineWidth = aGfxContext->CurrentLineWidth();
oldPattern = aGfxContext->GetPattern();
break;
case NS_STYLE_BORDER_STYLE_DASHED: {
aGfxContext->Save();
@ -4461,9 +4475,7 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
break;
}
default:
NS_ERROR("Invalid decoration value!");
if (contextIsSaved)
aGfxContext->Restore();
NS_NOTREACHED("Invalid decoration value!");
return;
}
@ -4503,12 +4515,16 @@ nsCSSRendering::PaintDecorationLine(gfxContext* aGfxContext,
aGfxContext->LineTo(gfxPoint(x + width, y));
}
aGfxContext->Stroke();
aGfxContext->Restore();
contextIsSaved = PR_FALSE;
break;
default:
NS_ERROR("Invalid style value!");
break;
}
NS_ASSERTION(!contextIsSaved, "The gfxContext has been saved, but not restored!");
if (contextIsSaved) {
aGfxContext->Restore();
} else {
aGfxContext->SetPattern(oldPattern);
aGfxContext->SetLineWidth(oldLineWidth);
}
}