diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 15:53:29 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-11 15:53:29 +0000 |
| commit | b3d154de5e4c318f88e4c4ad15fe626054365997 (patch) | |
| tree | 00a594cee4948ef59e7535073bfb25ad9a68619a /src/fonts | |
| parent | 247ac53c290c099537b7b07aefd80106612f6ee4 (diff) | |
Remove SK_FONTHOST_USES_FONTMGR.
Review URL: https://codereview.chromium.org/66783003
git-svn-id: http://skia.googlecode.com/svn/trunk@12217 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkGScalerContext.cpp | 9 | ||||
| -rw-r--r-- | src/fonts/SkGScalerContext.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp index 053efb3706..f0543c571a 100644 --- a/src/fonts/SkGScalerContext.cpp +++ b/src/fonts/SkGScalerContext.cpp @@ -220,15 +220,6 @@ size_t SkGTypeface::onGetTableData(SkFontTableTag tag, size_t offset, return fProxy->getTableData(tag, offset, length, data); } -SkTypeface* SkGTypeface::onRefMatchingStyle(Style style) const { - if (this->style() == style) { - return const_cast<SkGTypeface*>(SkRef(this)); - } - - SkAutoTUnref<SkTypeface> other(fProxy->refMatchingStyle(style)); - return SkNEW_ARGS(SkGTypeface, (other, fPaint)); -} - /////////////////////////////////////////////////////////////////////////////// #if 0 diff --git a/src/fonts/SkGScalerContext.h b/src/fonts/SkGScalerContext.h index 2b51bbd201..faca50ed6b 100644 --- a/src/fonts/SkGScalerContext.h +++ b/src/fonts/SkGScalerContext.h @@ -39,7 +39,6 @@ protected: virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE; virtual size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const SK_OVERRIDE; - virtual SkTypeface* onRefMatchingStyle(Style) const SK_OVERRIDE; private: SkTypeface* fProxy; |