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

src/core/SkTextToPathIter.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTextToPathIter_DEFINED
 #define SkTextToPathIter_DEFINED
 
 #include "SkAutoKern.h"
 #include "SkPaint.h"
 
 class SkGlyphCache;
 
 class SkTextBaseIter {
 protected:
     SkTextBaseIter(const char text[], size_t length, const SkPaint& paint,
                    bool applyStrokeAndPathEffects);
     ~SkTextBaseIter();
 
     SkGlyphCache*   fCache;
     SkPaint         fPaint;
     SkScalar        fScale;
     SkFixed         fPrevAdvance;
     const char*     fText;
     const char*     fStop;
-    SkMeasureCacheProc fGlyphCacheProc;
+    SkPaint::GlyphCacheProc fGlyphCacheProc;
 
     SkScalar        fXPos;      // accumulated xpos, returned in next
     SkAutoKern      fAutoKern;
     int             fXYIndex;   // cache for horizontal -vs- vertical text
 };
 
 class SkTextToPathIter : SkTextBaseIter {
 public:
     SkTextToPathIter(const char text[], size_t length, const SkPaint& paint,
                      bool applyStrokeAndPathEffects)
@@ skipping 55 matching lines @@
         fPrevAdvance = 0;
     }
 
 private:
     SkScalar fBounds[2];
     SkScalar fBoundsBase[2];
     TextType fTextType;
 };
 
 #endif