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

Mac: fix SkFontHost_mac.cpp to work with the new hinting interface.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@277 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
agl@chromium.org 2009-07-21 18:05:59 +00:00
parent 2db1177fd5
commit 1a18cdc85f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ports/SkFontHost_mac.cpp
View File

@ -18,6 +18,7 @@
#include "SkFontHost.h"
#include "SkDescriptor.h"
#include "SkEndian.h"
#include "SkPaint.h"
#include "SkPoint.h"
// Give 1MB font cache budget
@ -125,15 +126,13 @@ SkScalerContext_Mac::SkScalerContext_Mac(const SkDescriptor* desc)
SkScalarToFloat(m[SkMatrix::kMTransY]));
ATSStyleRenderingOptions renderOpts = kATSStyleApplyAntiAliasing;
switch (fRec.fHints) {
case kNo_Hints:
switch (fRec.getHinting()) {
case SkPaint::kNo_Hinting:
case SkPaint::kSlight_Hinting:
renderOpts |= kATSStyleNoHinting;
break;
case kSubpixel_Hints:
// hmmm, need to support subpixel... from path?
renderOpts |= kATSStyleNoHinting;
break;
case kNormal_Hints:
case SkPaint::kNormal_Hinting:
case SkPaint::kFull_Hinting:
renderOpts |= kATSStyleApplyHints;
break;
}
@ -229,8 +228,8 @@ void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph) {
set_glyph_metrics_on_error(glyph);
return;
}
if (kNormal_Hints == fRec.fHints) {
if (!fRec.fSubpixelPositioning) {
glyph->fAdvanceX = SkFloatToFixed(screenMetrics.deviceAdvance.x);
glyph->fAdvanceY = -SkFloatToFixed(screenMetrics.deviceAdvance.y);
} else {