Trim FontSelector interface a bit.

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 16 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/fonts/FontCache.h"
 
 #include "FontFamilyNames.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "platform/fonts/AlternateFontFamily.h"
+#include "platform/fonts/FontCacheClient.h"
 #include "platform/fonts/FontCacheKey.h"
 #include "platform/fonts/FontDataCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFallbackList.h"
 #include "platform/fonts/FontPlatformData.h"
-#include "platform/fonts/FontSelector.h"
 #include "platform/fonts/FontSmoothingMode.h"
 #include "platform/fonts/TextRenderingMode.h"
 #include "platform/fonts/opentype/OpenTypeVerticalData.h"
 #include "wtf/HashMap.h"
 #include "wtf/ListHashSet.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/AtomicStringHash.h"
 #include "wtf/text/StringHash.h"
 
 using namespace WTF;
@@ skipping 177 matching lines @@
     if (m_purgePreventCount)
         return;
 
     if (!gFontDataCache || !gFontDataCache->purge(PurgeSeverity))
         return;
 
     purgePlatformFontDataCache();
     purgeFontVerticalDataCache();
 }
 
-static HashSet<FontSelector*>* gClients;
+static HashSet<FontCacheClient*>* gClients;
 
-void FontCache::addClient(FontSelector* client)
+void FontCache::addClient(FontCacheClient* client)
 {
     if (!gClients)
-        gClients = new HashSet<FontSelector*>;
+        gClients = new HashSet<FontCacheClient*>;
 
     ASSERT(!gClients->contains(client));
     gClients->add(client);
 }
 
-void FontCache::removeClient(FontSelector* client)
+void FontCache::removeClient(FontCacheClient* client)
 {
     ASSERT(gClients);
     ASSERT(gClients->contains(client));
 
     gClients->remove(client);
 }
 
 static unsigned short gGeneration = 0;
 
 unsigned short FontCache::generation()
 {
     return gGeneration;
 }
 
 void FontCache::invalidate()
 {
     if (!gClients) {
         ASSERT(!gFontPlatformDataCache);
         return;
     }
 
     if (gFontPlatformDataCache) {
         delete gFontPlatformDataCache;
         gFontPlatformDataCache = new FontPlatformDataCache;
     }
 
     gGeneration++;
 
-    Vector<RefPtr<FontSelector> > clients;
+    Vector<RefPtr<FontCacheClient> > clients;
     size_t numClients = gClients->size();
     clients.reserveInitialCapacity(numClients);
-    HashSet<FontSelector*>::iterator end = gClients->end();
-    for (HashSet<FontSelector*>::iterator it = gClients->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