Revert of Font variations.

include/ports/SkFontMgr.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontMgr_DEFINED
 #define SkFontMgr_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkFontStyle.h"
 
 class SkData;
-class SkFontData;
 class SkStreamAsset;
 class SkString;
 class SkTypeface;
 
 class SK_API SkFontStyleSet : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkFontStyleSet)
 
     virtual int count() = 0;
     virtual void getStyle(int index, SkFontStyle*, SkString* style) = 0;
@@ skipping 63 matching lines @@
     SkTypeface* createFromData(SkData*, int ttcIndex = 0) const;
 
     /**
      *  Create a typeface for the specified stream and TTC index
      *  (pass 0 for none) or NULL if the stream is not recognized. The caller
      *  must call unref() on the returned object if it is not null.
      */
     SkTypeface* createFromStream(SkStreamAsset*, int ttcIndex = 0) const;
 
     /**
-     *  Create a typeface from the specified font data.
-     *  Takes ownership of the font data, so the caller should not reference it again.
-     *  Will return NULL if the typeface could not be created.
-     *  The caller must call unref() on the returned object if it is not null.
-     */
-    SkTypeface* createFromFontData(SkFontData*) const;
-
-    /**
      *  Create a typeface for the specified fileName and TTC index
      *  (pass 0 for none) or NULL if the file is not found, or its contents are
      *  not recognized. The caller must call unref() on the returned object
      *  if it is not null.
      */
     SkTypeface* createFromFile(const char path[], int ttcIndex = 0) const;
 
     SkTypeface* legacyCreateTypeface(const char familyName[],
                                      unsigned typefaceStyleBits) const;
 
@@ skipping 14 matching lines @@
     virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
                                            const SkFontStyle&) const = 0;
     virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], const SkFontStyle&,
                                                     const char* bcp47[], int bcp47Count,
                                                     SkUnichar character) const = 0;
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
                                          const SkFontStyle&) const = 0;
 
     virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) const = 0;
     virtual SkTypeface* onCreateFromStream(SkStreamAsset*, int ttcIndex) const = 0;
-    // TODO: make pure virtual.
-    virtual SkTypeface* onCreateFromFontData(SkFontData*) const;
     virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0;
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
                                                unsigned styleBits) const = 0;
 private:
     static SkFontMgr* Factory();    // implemented by porting layer
     friend SkFontMgr* sk_fontmgr_create_default();
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif