| Index: src/ports/SkFontHost_win.cpp
|
| ===================================================================
|
| --- src/ports/SkFontHost_win.cpp (revision 12201)
|
| +++ src/ports/SkFontHost_win.cpp (working copy)
|
| @@ -275,7 +275,6 @@
|
| 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;
|
| };
|
|
|
| class FontMemResourceTypeface : public LogFontTypeface {
|
| @@ -2452,10 +2451,6 @@
|
| return SkCreateTypefaceFromLOGFONT(lf);
|
| }
|
|
|
| -SkTypeface* LogFontTypeface::onRefMatchingStyle(Style style) const {
|
| - return create_typeface(this, NULL, style);
|
| -}
|
| -
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| #include "SkFontMgr.h"
|
| @@ -2617,25 +2612,6 @@
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -#ifndef SK_FONTHOST_USES_FONTMGR
|
| -
|
| -SkTypeface* SkFontHost::CreateTypeface(const SkTypeface* familyFace,
|
| - const char familyName[],
|
| - SkTypeface::Style styleBits) {
|
| - return create_typeface(familyFace, familyName, styleBits);
|
| -}
|
| -
|
| -SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
|
| - SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
|
| - return stream.get() ? CreateTypefaceFromStream(stream) : NULL;
|
| -}
|
| -
|
| -SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
|
| - return create_from_stream(stream);
|
| -}
|
| -
|
| -#endif
|
| -
|
| SkFontMgr* SkFontMgr_New_GDI() {
|
| return SkNEW(SkFontMgrGDI);
|
| }
|
|
|