Remove user specified typeface id.

tests/FontMgrTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkFontMgr.h"
 #include "SkTypeface.h"
@@ skipping 97 matching lines @@
 
             if (verbose) {
                 SkDebugf("\t[%d] %s [%3d %d %d]\n", j, sname.c_str(),
                          fs.weight(), fs.width(), fs.slant());
             }
         }
     }
 }
 
 static void test_matchStyleCSS3(skiatest::Reporter* reporter) {
-    static const SkFontID invalidFontID = std::numeric_limits<SkFontID>::max();
     static const SkFontStyle invalidFontStyle(101, SkFontStyle::kNormal_Width, SkFontStyle::kUpright_Slant);
 
     class TestTypeface : public SkTypeface {
     public:
-        TestTypeface(const SkFontStyle& fontStyle, SkFontID id) : SkTypeface(fontStyle, id, false){}
+        TestTypeface(const SkFontStyle& fontStyle) : SkTypeface(fontStyle, false){}
     protected:
         SkStreamAsset* onOpenStream(int* ttcIndex) const override { return nullptr; }
         SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
                                                const SkDescriptor*) const override {
             return nullptr;
         }
         void onFilterRec(SkScalerContextRec*) const override { }
         virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
             PerGlyphInfo,
             const uint32_t*, uint32_t) const override { return nullptr; }
@@ skipping 27 matching lines @@
     public:
         TestFontStyleSet(std::initializer_list<SkFontStyle> styles) : fStyles(styles) {}
         int count() override { return static_cast<int>(fStyles.size()); }
         void getStyle(int index, SkFontStyle* style, SkString*) override {
             if (style) {
                 *style = fStyles[index];
             }
         }
         SkTypeface* createTypeface(int index) override {
             if (index < 0 || this->count() <= index) {
-                return new TestTypeface(invalidFontStyle, invalidFontID);
+                return new TestTypeface(invalidFontStyle);
             }
-            return new TestTypeface(fStyles[index], index);
+            return new TestTypeface(fStyles[index]);
         }
         SkTypeface* matchStyle(const SkFontStyle& pattern) override {
             return this->matchStyleCSS3(pattern);
         }
     private:
         std::vector<SkFontStyle> fStyles;
     };
 
     SkFontStyle condensed_normal_100(SkFontStyle::kThin_Weight,  SkFontStyle::kCondensed_Width, SkFontStyle::kUpright_Slant);
     SkFontStyle condensed_normal_900(SkFontStyle::kBlack_Weight, SkFontStyle::kCondensed_Width, SkFontStyle::kUpright_Slant);
@@ skipping 519 matching lines @@
 }
 
 DEFINE_bool(verboseFontMgr, false, "run verbose fontmgr tests.");
 
 DEF_TEST(FontMgr, reporter) {
     test_matchStyleCSS3(reporter);
     test_fontiter(reporter, FLAGS_verboseFontMgr);
     test_alias_names(reporter);
     test_font(reporter);
 }