[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 HashSet<FontCacheClient*>* gClients;
+static bool invalidateFontCache = false;

[haraken, 2014/04/07 14:10:12]

invalidateFontCache => fontCacheMapIsInitialized ?

I don't fully understand what "invalidate" means here.

[wibling-chromium, 2014/04/08 09:35:59]

It guards whether we need to invalidate the cache, hence the name, by default we
don't need to invalidate the cache only when an object has been added.

+
+WillBeHeapHashSet<RawPtrWillBeMember<FontCacheClient> >& fontCacheClients()
+{
+#if ENABLE(OILPAN)
+    DEFINE_STATIC_LOCAL(Persistent<HeapHashSet<Member<FontCacheClient> > >, clients, (new HeapHashSet<Member<FontCacheClient> >()));

[haraken, 2014/04/07 14:10:12]

Shouldn't this be a hash set of weak members? I guess the pointers to
FontCacheClients are weak.

[wibling-chromium, 2014/04/08 09:35:59]

It is not strictly needed since removeClient is always called. That said it is
definitely a good idea so I will make that change now.

+#else
+    DEFINE_STATIC_LOCAL(HashSet<RawPtr<FontCacheClient> >*, clients, (new HashSet<RawPtr<FontCacheClient> >()));
+#endif
+    invalidateFontCache = true;
+    return *clients;
+}
 
 void FontCache::addClient(FontCacheClient* client)
 {
-    if (!gClients)
-        gClients = new HashSet<FontCacheClient*>;
-
-    ASSERT(!gClients->contains(client));
-    gClients->add(client);
+    ASSERT(!fontCacheClients().contains(client));
+    fontCacheClients().add(client);
 }
 
 void FontCache::removeClient(FontCacheClient* client)

[haraken, 2014/04/07 14:10:12]

If the FontCacheClients are weak, this method should be in #if !ENABLE(OILPAN).

[wibling-chromium, 2014/04/08 09:35:59]

Done.

 {
-    ASSERT(gClients);
-    ASSERT(gClients->contains(client));
-
-    gClients->remove(client);
+    ASSERT(fontCacheClients().contains(client));
+    fontCacheClients().remove(client);
 }
 
 static unsigned short gGeneration = 0;
 
 unsigned short FontCache::generation()
 {
     return gGeneration;
 }
 
 void FontCache::invalidate()
 {
-    if (!gClients) {
+    if (!invalidateFontCache) {
         ASSERT(!gFontPlatformDataCache);
         return;
     }
 
     if (gFontPlatformDataCache) {
         delete gFontPlatformDataCache;
         gFontPlatformDataCache = new FontPlatformDataCache;
     }
 
     gGeneration++;
 
-    Vector<RefPtr<FontCacheClient> > clients;
-    size_t numClients = gClients->size();
+    WillBeHeapVector<RefPtrWillBeMember<FontCacheClient> > clients;
+    size_t numClients = fontCacheClients().size();
     clients.reserveInitialCapacity(numClients);
-    HashSet<FontCacheClient*>::iterator end = gClients->end();
-    for (HashSet<FontCacheClient*>::iterator it = gClients->begin(); it != end; ++it)
+    WillBeHeapHashSet<RawPtrWillBeMember<FontCacheClient> >::iterator end = fontCacheClients().end();
+    for (WillBeHeapHashSet<RawPtrWillBeMember<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);
 }
 
 } // namespace WebCore