| Index: Source/platform/fonts/FontCache.cpp
|
| diff --git a/Source/platform/fonts/FontCache.cpp b/Source/platform/fonts/FontCache.cpp
|
| index b60338014cfabffffb8d276c4149a4a84d56676e..55b3307fe6bc266d480a9f8db96e2924f39367ce 100644
|
| --- a/Source/platform/fonts/FontCache.cpp
|
| +++ b/Source/platform/fonts/FontCache.cpp
|
| @@ -114,7 +114,7 @@ FontPlatformData* FontCache::getFontPlatformData(const FontDescription& fontDesc
|
| return result;
|
| }
|
|
|
| -typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, IntHash<FontCache::FontFileKey>, UnsignedWithZeroKeyHashTraits<FontCache::FontFileKey> > FontVerticalDataCache;
|
| +typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, IntHash<FontCache::FontFileKey>, UnsignedWithZeroKeyHashTraits<FontCache::FontFileKey>> FontVerticalDataCache;
|
|
|
| FontVerticalDataCache& fontVerticalDataCacheInstance()
|
| {
|
| @@ -231,9 +231,9 @@ void FontCache::purge(PurgeSeverity PurgeSeverity)
|
|
|
| static bool invalidateFontCache = false;
|
|
|
| -WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >& fontCacheClients()
|
| +WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>& fontCacheClients()
|
| {
|
| - DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> > >, clients, (adoptPtrWillBeNoop(new WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >())));
|
| + DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>> >, clients, (adoptPtrWillBeNoop(new WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>())));
|
| invalidateFontCache = true;
|
| return *clients;
|
| }
|
| @@ -273,11 +273,11 @@ void FontCache::invalidate()
|
|
|
| gGeneration++;
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<FontCacheClient> > clients;
|
| + WillBeHeapVector<RefPtrWillBeMember<FontCacheClient>> clients;
|
| size_t numClients = fontCacheClients().size();
|
| clients.reserveInitialCapacity(numClients);
|
| - WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >::iterator end = fontCacheClients().end();
|
| - for (WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >::iterator it = fontCacheClients().begin(); it != end; ++it)
|
| + WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>::iterator end = fontCacheClients().end();
|
| + for (WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>::iterator it = fontCacheClients().begin(); it != end; ++it)
|
| clients.append(*it);
|
|
|
| ASSERT(numClients == clients.size());
|
|
|