diff -r 10e98eab6f85 -r a359256acfc6 webengine/osswebengine/WebCore/platform/FontCache.cpp --- a/webengine/osswebengine/WebCore/platform/FontCache.cpp Fri Jul 03 15:54:40 2009 +0100 +++ b/webengine/osswebengine/WebCore/platform/FontCache.cpp Thu Aug 27 07:44:59 2009 +0300 @@ -104,23 +104,21 @@ static FontPlatformDataCache* gFontPlatformDataCache = 0; -struct cleanupFontDataCache { - ~cleanupFontDataCache() { - if( gFontPlatformDataCache ) - { - FontPlatformDataCacheIterator end = gFontPlatformDataCache->end(); - for (FontPlatformDataCacheIterator it = gFontPlatformDataCache->begin(); it != end; ++it) - { - FontPlatformData* obj = (*it).second; - delete obj; - } - gFontPlatformDataCache->clear(); - delete gFontPlatformDataCache; - gFontPlatformDataCache=0; - } +void cleanupFontDataCache() +{ + if( gFontPlatformDataCache ) + { + FontPlatformDataCacheIterator end = gFontPlatformDataCache->end(); + for (FontPlatformDataCacheIterator it = gFontPlatformDataCache->begin(); it != end; ++it) + { + FontPlatformData* obj = (*it).second; + delete obj; + } + gFontPlatformDataCache->clear(); + delete gFontPlatformDataCache; + gFontPlatformDataCache=0; } -}; -static cleanupFontDataCache cleanFontDataCache; +} static const AtomicString& alternateFamilyName(const AtomicString& familyName) {