Revert of Make fID and MixedID calculations private

src/gpu/GrPathRendering.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPathRendering.h"
 #include "SkDescriptor.h"
 #include "SkGlyph.h"
@@ skipping 12 matching lines @@
     virtual ~GlyphGenerator() {
         SkDescriptor::Free(fDesc);
     }
 
     int getNumPaths() SK_OVERRIDE {
         return fScalerContext->getGlyphCount();
     }
 
     void generatePath(int glyphID, SkPath* out) SK_OVERRIDE {
         SkGlyph skGlyph;
-        skGlyph.initWithGlyphID(glyphID);
+        skGlyph.init(SkGlyph::MakeID(glyphID));
         fScalerContext->getMetrics(&skGlyph);
 
         fScalerContext->getPath(skGlyph, out);
         out->transform(fFlipMatrix); // Load glyphs with the inverted y-direction.
     }
 
     bool isEqualTo(const SkDescriptor& desc) const SK_OVERRIDE {
         return fDesc->equals(desc);
     }
 
@@ skipping 26 matching lines @@
     SkAutoDescriptor ad(sizeof(rec) + SkDescriptor::ComputeOverhead(1));
     SkDescriptor*    genericDesc = ad.getDesc();
 
     genericDesc->init();
     genericDesc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
     genericDesc->computeChecksum();
 
     SkAutoTUnref<GlyphGenerator> generator(SkNEW_ARGS(GlyphGenerator, (*typeface, *genericDesc)));
     return this->createPathRange(generator, stroke);
 }