remove obsolete SK_USE_RUNTIME_GLOBALS

git-svn-id: http://skia.googlecode.com/svn/trunk@2711 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-11-17 21:35:41 +00:00
Родитель 0069aa5708
Коммит d54c85731e
2 изменённых файлов: 3 добавлений и 24 удалений

Просмотреть файл

@ -93,12 +93,6 @@
//#define SkLONGLONG int64_t
/* Some envorinments do not suport writable globals (eek!). If yours does not,
define this flag.
*/
//#define SK_USE_RUNTIME_GLOBALS
/* To write debug messages to a console, skia will call SkDebugf(...) following
printf conventions (e.g. const char* format, ...). If you want to redirect
this to something other than printf, define yours here

Просмотреть файл

@ -427,24 +427,9 @@ public:
#endif
};
#ifdef SK_USE_RUNTIME_GLOBALS
static SkGlobals::Rec* create_globals() {
SkGlyphCache_Globals* rec = SkNEW(SkGlyphCache_Globals);
rec->fHead = NULL;
rec->fTotalMemoryUsed = 0;
#ifdef USE_CACHE_HASH
memset(rec->fHash, 0, sizeof(rec->fHash));
#endif
return rec;
}
#define FIND_GC_GLOBALS() *(SkGlyphCache_Globals*)SkGlobals::Find(SkGlyphCache_GlobalsTag, create_globals)
#define GET_GC_GLOBALS() *(SkGlyphCache_Globals*)SkGlobals::Get(SkGlyphCache_GlobalsTag)
#else
static SkGlyphCache_Globals gGCGlobals;
#define FIND_GC_GLOBALS() gGCGlobals
#define GET_GC_GLOBALS() gGCGlobals
#endif
static SkGlyphCache_Globals gGCGlobals;
#define FIND_GC_GLOBALS() gGCGlobals
#define GET_GC_GLOBALS() gGCGlobals
void SkGlyphCache::VisitAllCaches(bool (*proc)(SkGlyphCache*, void*),
void* context) {