Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/platform/fonts/FontCache.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 294 matching lines @@
     if (!gFontDataCache || !gFontDataCache->purge(PurgeSeverity))
         return;
 
     purgePlatformFontDataCache();
     purgeFontVerticalDataCache();
     purgeFallbackListShaperCache();
 }
 
 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;
 }
 
 void FontCache::addClient(FontCacheClient* client)
 {
     ASSERT(!fontCacheClients().contains(client));
     fontCacheClients().add(client);
 }
 
@@ skipping 19 matching lines @@
         return;
     }
 
     if (gFontPlatformDataCache) {
         delete gFontPlatformDataCache;
         gFontPlatformDataCache = new FontPlatformDataCache;
     }
 
     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());
     for (size_t i = 0; i < numClients; ++i)
         clients[i]->fontCacheInvalidated();
 
     purge(ForcePurge);
 }
 
 void FontCache::dumpFontPlatformDataCache(WebProcessMemoryDump* memoryDump)
@@ skipping 22 matching lines @@
         iter != gFallbackListShaperCache->end();
         ++iter) {
         shapeResultCacheSize += iter->value->byteSize();
     }
     dump->addScalar("size", "bytes", shapeResultCacheSize);
     memoryDump->addSuballocation(dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName));
 }
 
 
 } // namespace blink