1 files changed, 4 insertions, 16 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/fonts/FontSelector.h b/chromium/third_party/WebKit/Source/platform/fonts/FontSelector.h
index 1225ffc783c..5c0db42ad1d 100644
--- a/chromium/third_party/WebKit/Source/platform/fonts/FontSelector.h
+++ b/chromium/third_party/WebKit/Source/platform/fonts/FontSelector.h
@@ -26,37 +26,25 @@
 #ifndef FontSelector_h
 #define FontSelector_h
 
+#include "platform/fonts/FontCacheClient.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/RefCounted.h"
+#include "wtf/text/AtomicString.h"
 
 namespace WebCore {
 
 class FontData;
 class FontDescription;
-class FontSelectorClient;
 
-class FontSelector : public RefCounted<FontSelector> {
+class FontSelector : public FontCacheClient {
 public:
     virtual ~FontSelector() { }
     virtual PassRefPtr<FontData> getFontData(const FontDescription&, const AtomicString& familyName) = 0;
-    virtual void willUseFontData(const FontDescription&, const AtomicString& familyName) = 0;
-
-    virtual void fontCacheInvalidated() { }
-
-    virtual void registerForInvalidationCallbacks(FontSelectorClient*) = 0;
-    virtual void unregisterForInvalidationCallbacks(FontSelectorClient*) = 0;
+    virtual void willUseFontData(const FontDescription&, const AtomicString& familyName, UChar32) = 0;
 
     virtual unsigned version() const = 0;
 };
 
-class FontSelectorClient {
-public:
-    virtual ~FontSelectorClient() { }
-
-    virtual void fontsNeedUpdate(FontSelector*) = 0;
-};
-
 } // namespace WebCore
 
 #endif // FontSelector_h