Index: trunk/src/core/SkPaint.cpp |
=================================================================== |
--- trunk/src/core/SkPaint.cpp (revision 8215) |
+++ trunk/src/core/SkPaint.cpp (working copy) |
@@ -414,8 +414,9 @@ |
#include "SkGlyphCache.h" |
#include "SkUtils.h" |
-static void DetachDescProc(const SkDescriptor* desc, void* context) { |
- *((SkGlyphCache**)context) = SkGlyphCache::DetachCache(desc); |
+static void DetachDescProc(SkTypeface* typeface, const SkDescriptor* desc, |
+ void* context) { |
+ *((SkGlyphCache**)context) = SkGlyphCache::DetachCache(typeface, desc); |
} |
#ifdef SK_BUILD_FOR_ANDROID |
@@ -1206,8 +1207,9 @@ |
return false; // don't detach the cache |
} |
-static void FontMetricsDescProc(const SkDescriptor* desc, void* context) { |
- SkGlyphCache::VisitCache(desc, FontMetricsCacheProc, context); |
+static void FontMetricsDescProc(SkTypeface* typeface, const SkDescriptor* desc, |
+ void* context) { |
+ SkGlyphCache::VisitCache(typeface, desc, FontMetricsCacheProc, context); |
} |
SkScalar SkPaint::getFontMetrics(FontMetrics* metrics, SkScalar zoom) const { |
@@ -1761,7 +1763,7 @@ |
*/ |
void SkPaint::descriptorProc(const SkDeviceProperties* deviceProperties, |
const SkMatrix* deviceMatrix, |
- void (*proc)(const SkDescriptor*, void*), |
+ void (*proc)(SkTypeface*, const SkDescriptor*, void*), |
void* context, bool ignoreGamma) const { |
SkScalerContext::Rec rec; |
@@ -1873,7 +1875,7 @@ |
} |
#endif |
- proc(desc, context); |
+ proc(fTypeface, desc, context); |
} |
SkGlyphCache* SkPaint::detachCache(const SkDeviceProperties* deviceProperties, |