Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 21:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strengthen the code that closes the gaps in stretchy chars so that it doesn't break Linux. Patch by Behdad Esfahbod <mozilla@behdad.org>, b=321994, r+sr=rbs

Browse Source
This commit is contained in:
rbs%maths.uq.edu.au 2006-10-06 15:38:17 +00:00
parent 59de0701db
commit 9d05f93491
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
layout/mathml/base/src/nsMathMLChar.cpp
View File

@ -2374,19 +2374,22 @@ nsMathMLChar::PaintVertically(nsPresContext* aPresContext,
aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
nsMathMLFrame::GetRuleThickness(fm, overlap);
overlap = 2 * PR_MAX(overlap, onePixel);
while (overlap > onePixel && bmdata[3].ascent + bmdata[3].descent <= 2*overlap)
while (overlap > 0 && bmdata[3].ascent + bmdata[3].descent <= 2*overlap + onePixel)
overlap -= onePixel;
// to protect against gaps, pretend the glue is smaller than
// it says to allow a small overlap when adjoining it
bmdata[3].ascent -= overlap;
bmdata[3].descent -= overlap;
if (overlap > 0) {
// to protect against gaps, pretend the glue is smaller than
// it says to allow a small overlap when adjoining it
bmdata[3].ascent -= overlap;
bmdata[3].descent -= overlap;
}
nscoord edge = PR_MAX(overlap, onePixel);
for (i = 0; i < 2; i++) {
PRInt32 count = 0;
dy = offset[i];
clipRect.SetRect(dx, end[i], width, start[i+1]-end[i]);
clipRect.Inflate(overlap, overlap);
clipRect.Inflate(edge, edge);
#ifdef SHOW_BORDERS
// exact area to fill
aRenderingContext.SetColor(NS_RGB(255,0,0));
@ -2403,7 +2406,10 @@ nsMathMLChar::PaintVertically(nsPresContext* aPresContext,
}
// defensive code against odd things such as a smallish TextZoom...
NS_ASSERTION(1000 != count, "something is probably wrong somewhere");
if (stride < onePixel || 1000 == count) return NS_ERROR_UNEXPECTED;
if (stride < onePixel || 1000 == count) {
aRenderingContext.PopState();
return NS_ERROR_UNEXPECTED;
}
dy += stride;
aGlyphTable->DrawGlyph(aRenderingContext, aFont, glue, dx, dy);
}
@ -2562,19 +2568,22 @@ nsMathMLChar::PaintHorizontally(nsPresContext* aPresContext,
aRenderingContext.GetFontMetrics(*getter_AddRefs(fm));
nsMathMLFrame::GetRuleThickness(fm, overlap);
overlap = 2 * PR_MAX(overlap, onePixel);
while (overlap > onePixel && bmdata[3].rightBearing - bmdata[3].leftBearing <= 2*overlap)
while (overlap > 0 && bmdata[3].rightBearing - bmdata[3].leftBearing <= 2*overlap + onePixel)
overlap -= onePixel;
// to protect against gaps, pretend the glue is smaller than
// it says to allow a small overlap when adjoining it
bmdata[3].leftBearing += overlap;
bmdata[3].rightBearing -= overlap;
if (overlap > 0) {
// to protect against gaps, pretend the glue is smaller than
// it says to allow a small overlap when adjoining it
bmdata[3].leftBearing += overlap;
bmdata[3].rightBearing -= overlap;
}
nscoord edge = PR_MAX(overlap, onePixel);
for (i = 0; i < 2; i++) {
PRInt32 count = 0;
dx = offset[i];
clipRect.SetRect(end[i], aRect.y, start[i+1]-end[i], aRect.height);
clipRect.Inflate(overlap, overlap);
clipRect.Inflate(edge, edge);
#ifdef SHOW_BORDERS
// rectangles in-between that are to be filled
aRenderingContext.SetColor(NS_RGB(255,0,0));
@ -2591,7 +2600,10 @@ nsMathMLChar::PaintHorizontally(nsPresContext* aPresContext,
}
// defensive code against odd things such as a smallish TextZoom...
NS_ASSERTION(1000 != count, "something is probably wrong somewhere");
if (stride < onePixel || 1000 == count) return NS_ERROR_UNEXPECTED;
if (stride < onePixel || 1000 == count) {
aRenderingContext.PopState();
return NS_ERROR_UNEXPECTED;
}
dx += stride;
aGlyphTable->DrawGlyph(aRenderingContext, aFont, glue, dx, dy);
}