diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-17 21:35:41 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-17 21:35:41 +0000 |
| commit | d54c85731eb45afcdee1272acfd0cafda6348bab (patch) | |
| tree | 1e8912e94d79456ca28785731b98e0d68c90e246 | |
| parent | 0069aa5708fc2b9b9b6c21ee37023ea5cee8be06 (diff) | |
remove obsolete SK_USE_RUNTIME_GLOBALS
git-svn-id: http://skia.googlecode.com/svn/trunk@2711 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/config/SkUserConfig.h | 6 | ||||
| -rw-r--r-- | src/core/SkGlyphCache.cpp | 21 |
2 files changed, 3 insertions, 24 deletions
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index 439cbea030..f0fa8417bc 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -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 diff --git a/src/core/SkGlyphCache.cpp b/src/core/SkGlyphCache.cpp index 937ac225b2..6beb62a976 100644 --- a/src/core/SkGlyphCache.cpp +++ b/src/core/SkGlyphCache.cpp @@ -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) { |