Remove user specified typeface id.

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 323 matching lines @@
         kNo_PerGlyphInfo         = 0x0, // Don't populate any per glyph info.
         kHAdvance_PerGlyphInfo   = 0x1, // Populate horizontal advance data.
         kVAdvance_PerGlyphInfo   = 0x2, // Populate vertical advance data.
         kGlyphNames_PerGlyphInfo = 0x4, // Populate glyph names (Type 1 only).
         kToUnicode_PerGlyphInfo  = 0x8  // Populate ToUnicode table, ignored
         // for Type 1 fonts
     };
 
     /** uniqueID must be unique and non-zero
     */
-    SkTypeface(const SkFontStyle& style, SkFontID uniqueID, bool isFixedPitch = false);
+    SkTypeface(const SkFontStyle& style, bool isFixedPitch = false);
     virtual ~SkTypeface();
 
     /** Sets the fixedPitch bit. If used, must be called in the constructor. */
     void setIsFixedPitch(bool isFixedPitch) { fIsFixedPitch = isFixedPitch; }
 
     friend class SkScalerContext;
     static SkTypeface* GetDefaultTypeface(Style style = SkTypeface::kNormal);
 
     virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
                                                    const SkDescriptor*) const = 0;
@@ skipping 61 matching lines @@
     mutable SkOnce      fBoundsOnce;
     bool                fIsFixedPitch;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif