diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-20 20:01:47 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-20 20:01:47 +0000 |
| commit | 2689f615e364dc48ad73826564f5b13d2329179d (patch) | |
| tree | d3bd8573251e8e0c25bf6107bf873451e0695434 /src/ports/SkFontHost_win.cpp | |
| parent | 8366df025a5c3eb562c6bff1ddf63213fbf3f7d6 (diff) | |
move impl of AdvancedTypefaceMetrics into typeface (3)
Review URL: https://codereview.chromium.org/12807004
git-svn-id: http://skia.googlecode.com/svn/trunk@8274 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkFontHost_win.cpp')
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index b430a04d9b..d58ba6ae59 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -200,6 +200,9 @@ public: protected: virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; + virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( + SkAdvancedTypefaceMetrics::PerGlyphInfo, + const uint32_t*, uint32_t) const SK_OVERRIDE; }; class FontMemResourceTypeface : public LogFontTypeface { @@ -1347,14 +1350,11 @@ static bool getWidthAdvance(HDC hdc, int gId, int16_t* advance) { return true; } -// static -SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( - uint32_t fontID, +SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo, const uint32_t* glyphIDs, - uint32_t glyphIDsCount) { - LOGFONT lf; - GetLogFontByID(fontID, &lf); + uint32_t glyphIDsCount) const { + LOGFONT lf = fLogFont; SkAdvancedTypefaceMetrics* info = NULL; HDC hdc = CreateCompatibleDC(NULL); @@ -1371,7 +1371,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( OUTLINETEXTMETRIC otm; unsigned int otmRet = GetOutlineTextMetrics(hdc, sizeof(otm), &otm); if (0 == otmRet) { - ensure_typeface_accessible(fontID); + ensure_typeface_accessible(this->uniqueID()); otmRet = GetOutlineTextMetrics(hdc, sizeof(otm), &otm); } if (!otmRet || !GetTextFace(hdc, LF_FACESIZE, lf.lfFaceName)) { |