Revert of [Oilpan]: Moving the FontSelector/FontCacheClient, CSSSegmentedFontFace, and FontFaceCache to the o…

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 225 matching lines @@
     if (m_purgePreventCount)
         return;
 
     if (!gFontDataCache || !gFontDataCache->purge(PurgeSeverity))
         return;
 
     purgePlatformFontDataCache();
     purgeFontVerticalDataCache();
 }
 
-static bool invalidateFontCache = false;
-
-WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >& fontCacheClients()
-{
-#if ENABLE(OILPAN)
-    DEFINE_STATIC_LOCAL(Persistent<HeapHashSet<WeakMember<FontCacheClient> > >, clients, (new HeapHashSet<WeakMember<FontCacheClient> >()));
-#else
-    DEFINE_STATIC_LOCAL(HashSet<RawPtr<FontCacheClient> >*, clients, (new HashSet<RawPtr<FontCacheClient> >()));
-#endif
-    invalidateFontCache = true;
-    return *clients;
-}
+static HashSet<FontCacheClient*>* gClients;
 
 void FontCache::addClient(FontCacheClient* client)
 {
-    ASSERT(!fontCacheClients().contains(client));
-    fontCacheClients().add(client);
+    if (!gClients)
+        gClients = new HashSet<FontCacheClient*>;
+
+    ASSERT(!gClients->contains(client));
+    gClients->add(client);
 }
 
-#if !ENABLE(OILPAN)
 void FontCache::removeClient(FontCacheClient* client)
 {
-    ASSERT(fontCacheClients().contains(client));
-    fontCacheClients().remove(client);
+    ASSERT(gClients);
+    ASSERT(gClients->contains(client));
+
+    gClients->remove(client);
 }
-#endif
 
 static unsigned short gGeneration = 0;
 
 unsigned short FontCache::generation()
 {
     return gGeneration;
 }
 
 void FontCache::invalidate()
 {
-    if (!invalidateFontCache) {
+    if (!gClients) {
         ASSERT(!gFontPlatformDataCache);
         return;
     }
 
     if (gFontPlatformDataCache) {
         delete gFontPlatformDataCache;
         gFontPlatformDataCache = new FontPlatformDataCache;
     }
 
     gGeneration++;
 
-    WillBeHeapVector<RefPtrWillBeMember<FontCacheClient> > clients;
-    size_t numClients = fontCacheClients().size();
+    Vector<RefPtr<FontCacheClient> > clients;
+    size_t numClients = gClients->size();
     clients.reserveInitialCapacity(numClients);
-    WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >::iterator end = fontCacheClients().end();
-    for (WillBeHeapHashSet<RawPtrWillBeWeakMember<FontCacheClient> >::iterator it = fontCacheClients().begin(); it != end; ++it)
+    HashSet<FontCacheClient*>::iterator end = gClients->end();
+    for (HashSet<FontCacheClient*>::iterator it = gClients->begin(); it != end; ++it)
         clients.append(*it);
 
     ASSERT(numClients == clients.size());
     for (size_t i = 0; i < numClients; ++i)
         clients[i]->fontCacheInvalidated();
 
     purge(ForcePurge);
 }
 
 } // namespace WebCore