Revert of Font variations.

src/ports/SkFontHost_linux.cpp

 /*
  * 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.
  */
 
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontDescriptor.h"
 #include "SkFontMgr.h"
@@ skipping 21 matching lines @@
 
     bool isSysFont() const { return fIsSysFont; }
 
 protected:
     void onGetFamilyName(SkString* familyName) const override {
         *familyName = fFamilyName;
     }
 
     void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override {
         desc->setFamilyName(fFamilyName.c_str());
+        desc->setFontIndex(fIndex);
         *isLocal = !this->isSysFont();
     }
 
     int getIndex() const { return fIndex; }
 
 private:
     const bool fIsSysFont;
     const SkString fFamilyName;
     const int fIndex;
 
@@ skipping 246 matching lines @@
 
     SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
         SkAutoTDelete<SkStreamAsset> stream(bareStream);
         if (NULL == stream || stream->getLength() <= 0) {
             return NULL;
         }
 
         bool isFixedPitch;
         SkFontStyle style;
         SkString name;
-        if (fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, NULL)) {
+        if (fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch)) {
             return SkNEW_ARGS(SkTypeface_Stream, (style, isFixedPitch, false, name,
                                                   stream.detach(), ttcIndex));
         } else {
             return NULL;
         }
     }
 
     SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
         SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path));
         return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : NULL;
@@ skipping 78 matching lines @@
             int numFaces;
             if (!scanner.recognizedFont(stream, &numFaces)) {
                 SkDebugf("---- failed to open <%s> as a font\n", filename.c_str());
                 continue;
             }
 
             for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
                 bool isFixedPitch;
                 SkString realname;
                 SkFontStyle style = SkFontStyle(); // avoid uninitialized warning
-                if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch, NULL)) {
+                if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch)) {
                     SkDebugf("---- failed to open <%s> <%d> as a font\n",
                              filename.c_str(), faceIndex);
                     continue;
                 }
 
                 SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_File, (
                                                     style,
                                                     isFixedPitch,
                                                     true,  // system-font (cannot delete)
                                                     realname,
@@ skipping 65 matching lines @@
         int numFaces;
         if (!scanner.recognizedFont(stream, &numFaces)) {
             SkDebugf("---- failed to open <%d> as a font\n", index);
             return;
         }
 
         for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
             bool isFixedPitch;
             SkString realname;
             SkFontStyle style = SkFontStyle(); // avoid uninitialized warning
-            if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch, NULL)) {
+            if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch)) {
                 SkDebugf("---- failed to open <%d> <%d> as a font\n", index, faceIndex);
                 return;
             }
 
             SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_Stream, (
                                                 style,
                                                 isFixedPitch,
                                                 true,  // system-font (cannot delete)
                                                 realname,
                                                 stream.detach(),
@@ skipping 21 matching lines @@
 #else
 
 #ifndef SK_FONT_FILE_PREFIX
 #    define SK_FONT_FILE_PREFIX "/usr/share/fonts/"
 #endif
 SkFontMgr* SkFontMgr::Factory() {
     return new SkFontMgr_Custom(DirectorySystemFontLoader(SK_FONT_FILE_PREFIX));
 }
 
 #endif