AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better handling of bitmaps in DirectWrite.

Browse Source 
R=reed@google.com

Review URL: https://codereview.chromium.org/303773002

git-svn-id: http://skia.googlecode.com/svn/trunk@14915 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2014-05-28 15:40:26 +00:00
parent 5889e30996
commit 7c18351d1f
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ports/SkFontHost_win_dw.cpp
View File

@ -741,31 +741,46 @@ SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface,
// If the scale is negative, this means the matrix will do the flip anyway. // If the scale is negative, this means the matrix will do the flip anyway.
SkScalar realTextSize = SkScalarAbs(GA.get(SkMatrix::kMScaleY)); SkScalar realTextSize = SkScalarAbs(GA.get(SkMatrix::kMScaleY));
// Due to floating point math, the lower bits are suspect. Round carefully. // Due to floating point math, the lower bits are suspect. Round carefully.
SkScalar roundedTextSize = SkScalarRoundToScalar(realTextSize * 64.0f) / 64.0f; SkScalar gdiTextSize = SkScalarRoundToScalar(realTextSize * 64.0f) / 64.0f;
SkScalar gdiTextSize = SkScalarFloorToScalar(roundedTextSize);
if (gdiTextSize == 0) { if (gdiTextSize == 0) {
gdiTextSize = SK_Scalar1; gdiTextSize = SK_Scalar1;
} }
bool hasBitmap = fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag && bool bitmapRequested = SkToBool(fRec.fFlags & SkScalerContext::kEmbeddedBitmapText_Flag);
hasBitmapStrike(typeface, SkScalarTruncToInt(gdiTextSize)); bool hasBitmap = false;
bool axisAligned = isAxisAligned(fRec); bool axisAlignedBitmap = false;
bool isBiLevel = SkMask::kBW_Format == fRec.fMaskFormat || (hasBitmap && axisAligned); if (bitmapRequested) {
hasBitmap = hasBitmapStrike(typeface, SkScalarTruncToInt(gdiTextSize));
axisAlignedBitmap = isAxisAligned(fRec);
}
if (isBiLevel) { // If the user requested aliased, do so with aliased compatible metrics.
if (SkMask::kBW_Format == fRec.fMaskFormat) {
fTextSizeRender = gdiTextSize; fTextSizeRender = gdiTextSize;
fRenderingMode = DWRITE_RENDERING_MODE_ALIASED; fRenderingMode = DWRITE_RENDERING_MODE_ALIASED;
fTextureType = DWRITE_TEXTURE_ALIASED_1x1; fTextureType = DWRITE_TEXTURE_ALIASED_1x1;
fTextSizeMeasure = gdiTextSize; fTextSizeMeasure = gdiTextSize;
fMeasuringMode = DWRITE_MEASURING_MODE_GDI_CLASSIC; fMeasuringMode = DWRITE_MEASURING_MODE_GDI_CLASSIC;
// If we can use a bitmap, use gdi classic rendering and measurement.
// This will not always provide a bitmap, but matches expected behavior.
} else if (hasBitmap && axisAlignedBitmap) {
fTextSizeRender = gdiTextSize;
fRenderingMode = DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC;
fTextureType = DWRITE_TEXTURE_CLEARTYPE_3x1;
fTextSizeMeasure = gdiTextSize;
fMeasuringMode = DWRITE_MEASURING_MODE_GDI_CLASSIC;
// If rotated but the horizontal text could have used a bitmap,
// render high quality rotated glyphs but measure using bitmap metrics.
} else if (hasBitmap) { } else if (hasBitmap) {
// If rotated but the horizontal text would have used a bitmap,
// render high quality rotated glyphs using the bitmap metrics.
fTextSizeRender = gdiTextSize; fTextSizeRender = gdiTextSize;
fRenderingMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC; fRenderingMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC;
fTextureType = DWRITE_TEXTURE_CLEARTYPE_3x1; fTextureType = DWRITE_TEXTURE_CLEARTYPE_3x1;
fTextSizeMeasure = gdiTextSize; fTextSizeMeasure = gdiTextSize;
fMeasuringMode = DWRITE_MEASURING_MODE_GDI_CLASSIC; fMeasuringMode = DWRITE_MEASURING_MODE_GDI_CLASSIC;
// The normal case is to use natural symmetric rendering and linear metrics.
} else { } else {
fTextSizeRender = realTextSize; fTextSizeRender = realTextSize;
fRenderingMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC; fRenderingMode = DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC;