Simplify and combine SkDrawCacheProc and SkMeasureCacheProc to SkPaint::GlyphCacheProc.

src/core/SkTextToPathIter.h

Index: src/core/SkTextToPathIter.h
diff --git a/src/core/SkTextToPathIter.h b/src/core/SkTextToPathIter.h
index e299552327e44b72a4cc5e9f3029ae77babcc6bd..435c1c79f0e5a56d65c4855668c7552425f0f7a3 100644
--- a/src/core/SkTextToPathIter.h
+++ b/src/core/SkTextToPathIter.h
@@ -25,7 +25,7 @@ protected:
     SkFixed         fPrevAdvance;
     const char*     fText;
     const char*     fStop;
-    SkMeasureCacheProc fGlyphCacheProc;
+    SkPaint::GlyphCacheProc fGlyphCacheProc;
 
     SkScalar        fXPos;      // accumulated xpos, returned in next
     SkAutoKern      fAutoKern;