Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: trunk/src/core/SkGlyphCache.h

Issue 12706010: Add SkTypeface* parameter to SkScalerContext (and its callers) (Closed) Base URL: http://skia.googlecode.com/svn/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/include/core/SkTypeface.h ('k') | trunk/src/core/SkGlyphCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/core/SkGlyphCache.h
===================================================================
--- trunk/src/core/SkGlyphCache.h (revision 8215)
+++ trunk/src/core/SkGlyphCache.h (working copy)
@@ -135,7 +135,7 @@
create a new one. If the proc() returns true, detach the cache and
return it, otherwise leave it and return NULL.
*/
- static SkGlyphCache* VisitCache(const SkDescriptor* desc,
+ static SkGlyphCache* VisitCache(SkTypeface*, const SkDescriptor* desc,
bool (*proc)(const SkGlyphCache*, void*),
void* context);
@@ -154,8 +154,9 @@
eventually get purged, and the win is that different thread will never
block each other while a strike is being used.
*/
- static SkGlyphCache* DetachCache(const SkDescriptor* desc) {
- return VisitCache(desc, DetachProc, NULL);
+ static SkGlyphCache* DetachCache(SkTypeface* typeface,
+ const SkDescriptor* desc) {
+ return VisitCache(typeface, desc, DetachProc, NULL);
}
#ifdef SK_DEBUG
@@ -184,7 +185,7 @@
};
private:
- SkGlyphCache(const SkDescriptor*);
+ SkGlyphCache(SkTypeface*, const SkDescriptor*);
~SkGlyphCache();
enum MetricsType {
@@ -273,8 +274,8 @@
class SkAutoGlyphCache {
public:
SkAutoGlyphCache(SkGlyphCache* cache) : fCache(cache) {}
- SkAutoGlyphCache(const SkDescriptor* desc) {
- fCache = SkGlyphCache::DetachCache(desc);
+ SkAutoGlyphCache(SkTypeface* typeface, const SkDescriptor* desc) {
+ fCache = SkGlyphCache::DetachCache(typeface, desc);
}
SkAutoGlyphCache(const SkPaint& paint,
const SkDeviceProperties* deviceProperties,
« no previous file with comments | « trunk/include/core/SkTypeface.h ('k') | trunk/src/core/SkGlyphCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698