From f91c47d91d72a1d85e2d6701864b8d7accc81647 Mon Sep 17 00:00:00 2001 From: bungeman Date: Wed, 10 Sep 2014 15:49:48 -0700 Subject: Remove a layer of indirection and code from SkFontHost. R=mtklein@google.com, tomhudson@google.com, djsollen@google.com Author: bungeman@google.com Review URL: https://codereview.chromium.org/105223006 --- include/core/SkFontHost.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'include/core/SkFontHost.h') diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h index 4c5013fe4a..a2cc04bc70 100644 --- a/include/core/SkFontHost.h +++ b/include/core/SkFontHost.h @@ -90,42 +90,6 @@ public: static void SetSubpixelOrder(LCDOrder order); /** @deprecated get from Device. */ static LCDOrder GetSubpixelOrder(); - -private: - /** Return a new, closest matching typeface given either an existing family - (specified by a typeface in that family) or by a familyName and a - requested style. - 1) If familyFace is null, use familyName. - 2) If familyName is null, use data (UTF-16 to cover). - 3) If all are null, return the default font that best matches style - */ - static SkTypeface* CreateTypeface(const SkTypeface* familyFace, - const char familyName[], - SkTypeface::Style style); - - /** Return a new typeface given the data buffer. If the data does not - represent a valid font, returns null. - - If a typeface instance is returned, the caller is responsible for - calling unref() on the typeface when they are finished with it. - - The returned typeface may or may not have called ref() on the stream - parameter. If the typeface has not called ref(), then it may have made - a copy of the releveant data. In either case, the caller is still - responsible for its refcnt ownership of the stream. - */ - static SkTypeface* CreateTypefaceFromStream(SkStream*); - - /** Return a new typeface from the specified file path. If the file does not - represent a valid font, this returns null. If a typeface is returned, - the caller is responsible for calling unref() when it is no longer used. - */ - static SkTypeface* CreateTypefaceFromFile(const char path[]); - - /////////////////////////////////////////////////////////////////////////// - - friend class SkScalerContext; - friend class SkTypeface; }; #endif -- cgit v1.2.3