Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 06:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert canvas text measurement widths from app units to pixels *after* they switch from integers to floats. (Bug 667947) r=roc

Browse Source
This commit is contained in:
L. David Baron 2011-06-29 14:39:21 -07:00
parent 58df7199e0
commit 362567a30a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/canvas/src/nsCanvasRenderingContext2D.cpp
View File

@ -2622,7 +2622,7 @@ struct NS_STACK_CLASS nsCanvasBidiProcessor : public nsBidiPresUtils::BidiProces
mBoundingBox = mBoundingBox.Union(textRunMetrics.mBoundingBox); mBoundingBox = mBoundingBox.Union(textRunMetrics.mBoundingBox);
} }
return static_cast<nscoord>(textRunMetrics.mAdvanceWidth/gfxFloat(mAppUnitsPerDevPixel)); return NSToCoordRound(textRunMetrics.mAdvanceWidth);
} }
virtual void DrawText(nscoord xOffset, nscoord width) virtual void DrawText(nscoord xOffset, nscoord width)
@ -2773,7 +2773,7 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
processor.mFontgrp = GetCurrentFontStyle(); processor.mFontgrp = GetCurrentFontStyle();
NS_ASSERTION(processor.mFontgrp, "font group is null"); NS_ASSERTION(processor.mFontgrp, "font group is null");
nscoord totalWidth; nscoord totalWidthCoord;
// calls bidi algo twice since it needs the full text width and the // calls bidi algo twice since it needs the full text width and the
// bounding boxes before rendering anything // bounding boxes before rendering anything
@ -2785,12 +2785,13 @@ nsCanvasRenderingContext2D::DrawOrMeasureText(const nsAString& aRawText,
nsBidiPresUtils::MODE_MEASURE, nsBidiPresUtils::MODE_MEASURE,
nsnull, nsnull,
0, 0,
&totalWidth); &totalWidthCoord);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
float totalWidth = float(totalWidthCoord) / processor.mAppUnitsPerDevPixel;
if (aWidth) if (aWidth)
*aWidth = static_cast<float>(totalWidth); *aWidth = totalWidth;
// if only measuring, don't need to do any more work // if only measuring, don't need to do any more work
if (aOp==TEXT_DRAW_OPERATION_MEASURE) if (aOp==TEXT_DRAW_OPERATION_MEASURE)