Remove some uses of SK_SUPPORT_LEGACY_TYPEFACE_PTR.

include/core/SkTypeface.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTypeface_DEFINED
 #define SkTypeface_DEFINED
 
@@ skipping 108 matching lines @@
 
     /** Return the typeface that most closely matches the requested typeface and style.
         Use this to pick a new style from the same family of the existing typeface.
         If family is nullptr, this selects from the default font's family.
 
         @param family  May be NULL. The name of the existing type face.
         @param s       The style (normal, bold, italic) of the type face.
         @return the closest-matching typeface.
     */
     static sk_sp<SkTypeface> MakeFromTypeface(SkTypeface* family, Style);
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
-    static SkTypeface* CreateFromTypeface(const SkTypeface* family, Style style) {
-        return MakeFromTypeface(const_cast<SkTypeface*>(family), style).release();
-    }
-#endif
 
     /** Return a new typeface given a file. If the file does not exist, or is
         not a valid font file, returns nullptr.
     */
     static sk_sp<SkTypeface> MakeFromFile(const char path[], int index = 0);
 #ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
     static SkTypeface* CreateFromFile(const char path[], int index = 0) {
         return MakeFromFile(path, index).release();
     }
 #endif
 
     /** Return a new typeface given a stream. If the stream is
         not a valid font file, returns nullptr. Ownership of the stream is
         transferred, so the caller must not reference it again.
     */
     static sk_sp<SkTypeface> MakeFromStream(SkStreamAsset* stream, int index = 0);
 #ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
     static SkTypeface* CreateFromStream(SkStreamAsset* stream, int index = 0) {
         return MakeFromStream(stream, index).release();
     }
 #endif
 
     /** Return a new typeface given font data and configuration. If the data
         is not valid font data, returns nullptr. Ownership of the font data is
         transferred, so the caller must not reference it again.
     */
     static sk_sp<SkTypeface> MakeFromFontData(SkFontData*);
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
-    static SkTypeface* CreateFromFontData(SkFontData* fd) {
-        return MakeFromFontData(fd).release();
-    }
-#endif
 
     /** Write a unique signature to a stream, sufficient to reconstruct a
         typeface referencing the same font when Deserialize is called.
      */
     void serialize(SkWStream*) const;
 
     /** Given the data previously written by serialize(), return a new instance
         of a typeface referring to the same font. If that font is not available,
         return nullptr.
         Does not affect ownership of SkStream.
      */
     static sk_sp<SkTypeface> MakeDeserialize(SkStream*);
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
-    static SkTypeface* Deserialize(SkStream* stream) {
-        return MakeDeserialize(stream).release();
-    }
-#endif
 
     enum Encoding {
         kUTF8_Encoding,
         kUTF16_Encoding,
         kUTF32_Encoding
     };
 
     /**
      *  Given an array of character codes, of the specified encoding,
      *  optionally return their corresponding glyph IDs (if glyphs is not NULL).
@@ skipping 238 matching lines @@
     mutable SkOnce      fBoundsOnce;
     bool                fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif