| Index: third_party/WebKit/Source/platform/fonts/FontCache.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
|
| index 649e475b77286cadc795edc066c661081bacfdd4..5baf7bd77a613fb30469a5cae0ec507c44f3c620 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
|
| @@ -312,9 +312,9 @@ void FontCache::purge(PurgeSeverity PurgeSeverity)
|
|
|
| static bool invalidateFontCache = false;
|
|
|
| -WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>& fontCacheClients()
|
| +HeapHashSet<WeakMember<FontCacheClient>>& fontCacheClients()
|
| {
|
| - DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>>, clients, (adoptPtrWillBeNoop(new WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient>>())));
|
| + DEFINE_STATIC_LOCAL(Persistent<HeapHashSet<WeakMember<FontCacheClient>>>, clients, ((new HeapHashSet<WeakMember<FontCacheClient>>())));
|
| invalidateFontCache = true;
|
| return *clients;
|
| }
|
| @@ -354,11 +354,11 @@ void FontCache::invalidate()
|
|
|
| gGeneration++;
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<FontCacheClient>> clients;
|
| + HeapVector<Member<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)
|
| + HeapHashSet<WeakMember<FontCacheClient>>::iterator end = fontCacheClients().end();
|
| + for (HeapHashSet<WeakMember<FontCacheClient>>::iterator it = fontCacheClients().begin(); it != end; ++it)
|
| clients.append(*it);
|
|
|
| ASSERT(numClients == clients.size());
|
|
|