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 839957 - Avoid inaccuracies when computing SVG glyph positions. r=longsonr

Browse Source
This commit is contained in:
Cameron McCormack 2013-04-10 22:58:55 +10:00
parent 9e5cc3efcb
commit 78fd3572f3
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
layout/svg/nsSVGTextFrame2.cpp
View File

@ -4154,9 +4154,6 @@ nsSVGTextFrame2::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
nsPoint position, lastPosition;
float cssPxPerDevPx = PresContext()->
AppUnitsToFloatCSSPixels(PresContext()->AppUnitsPerDevPixel());
TextFrameIterator frit(this);
for (nsTextFrame* frame = frit.Current(); frame; frame = frit.Next()) {
gfxSkipCharsIterator it = frame->EnsureTextRun(nsTextFrame::eInflated);
@ -4168,8 +4165,6 @@ nsSVGTextFrame2::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
position.x += frame->GetRect().width;
}
position.y += GetBaselinePosition(frame, textRun, frit.DominantBaseline());
position = nsPoint(nscoord(position.x * cssPxPerDevPx),
nscoord(position.y * cssPxPerDevPx));
// Any characters not in a frame, e.g. when display:none.
for (uint32_t i = 0; i < frit.UndisplayedCharacters(); i++) {
@ -4190,9 +4185,8 @@ nsSVGTextFrame2::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
!it.IsOriginalCharSkipped() &&
(!textRun->IsLigatureGroupStart(it.GetSkippedOffset()) ||
!textRun->IsClusterStart(it.GetSkippedOffset()))) {
gfxFloat advance =
textRun->GetAdvanceWidth(it.GetSkippedOffset(), 1,
nullptr) * cssPxPerDevPx;
nscoord advance = textRun->GetAdvanceWidth(it.GetSkippedOffset(), 1,
nullptr);
position.x += textRun->IsRightToLeft() ? -advance : advance;
aPositions.AppendElement(lastPosition);
it.AdvanceOriginal(1);
@ -4206,9 +4200,8 @@ nsSVGTextFrame2::DetermineCharPositions(nsTArray<nsPoint>& aPositions)
textRun->IsClusterStart(it.GetSkippedOffset())) {
// A real visible character.
uint32_t length = ClusterLength(textRun, it);
gfxFloat advance =
textRun->GetAdvanceWidth(it.GetSkippedOffset(), length,
nullptr) * cssPxPerDevPx;
nscoord advance = textRun->GetAdvanceWidth(it.GetSkippedOffset(),
length, nullptr);
position.x += textRun->IsRightToLeft() ? -advance : advance;
lastPosition = position;
}
@ -4598,6 +4591,9 @@ nsSVGTextFrame2::DoGlyphPositioning()
mPositions[0].mAngle = 0.0;
}
float cssPxPerDevPx = PresContext()->
AppUnitsToFloatCSSPixels(PresContext()->AppUnitsPerDevPixel());
// Fill in any unspecified character positions based on the positions recorded
// in charPositions, and also add in the dx/dy values.
if (!deltas.IsEmpty()) {
@ -4609,14 +4605,14 @@ nsSVGTextFrame2::DoGlyphPositioning()
nscoord d = charPositions[i].x - charPositions[i - 1].x;
mPositions[i].mPosition.x =
mPositions[i - 1].mPosition.x +
presContext->AppUnitsToGfxUnits(d) / mFontSizeScaleFactor;
presContext->AppUnitsToGfxUnits(d) * cssPxPerDevPx / mFontSizeScaleFactor;
}
// Fill in unspecified y position.
if (!mPositions[i].IsYSpecified()) {
nscoord d = charPositions[i].y - charPositions[i - 1].y;
mPositions[i].mPosition.y =
mPositions[i - 1].mPosition.y +
presContext->AppUnitsToGfxUnits(d) / mFontSizeScaleFactor;
presContext->AppUnitsToGfxUnits(d) * cssPxPerDevPx / mFontSizeScaleFactor;
}
// Add in dx/dy.
if (i < deltas.Length()) {
@ -4642,9 +4638,9 @@ nsSVGTextFrame2::DoGlyphPositioning()
nscoord dy = charPositions[i].y - charPositions[i - 1].y;
gfxPoint pt(mPositions[i - 1].mPosition.x +
presContext->AppUnitsToGfxUnits(dx),
presContext->AppUnitsToGfxUnits(dx) * cssPxPerDevPx,
mPositions[i - 1].mPosition.y +
presContext->AppUnitsToGfxUnits(dy));
presContext->AppUnitsToGfxUnits(dy) * cssPxPerDevPx);
mPositions.AppendElement(CharPosition(pt / mFontSizeScaleFactor,
mPositions[i - 1].mAngle));