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

Source/core/css/CSSFontSelector.h

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 30 matching lines @@
 class CSSFontFace;
 class CSSFontFaceRule;
 class CSSFontSelectorClient;
 class CSSSegmentedFontFace;
 class FontResource;
 class Document;
 class FontDescription;
 class StyleRuleFontFace;
 
 class FontLoader {
-    DISALLOW_ALLOCATION();
 public:
     explicit FontLoader(ResourceFetcher*);
 
     void addFontToBeginLoading(FontResource*);
     void loadPendingFonts();
 
     void clearResourceFetcher();
 
-    void trace(Visitor*) { }
-
 private:
     void beginLoadTimerFired(Timer<FontLoader>*);
 
     Timer<FontLoader> m_beginLoadingTimer;
     Vector<ResourcePtr<FontResource> > m_fontsToBeginLoading;
     ResourceFetcher* m_resourceFetcher;
 };
 
 class CSSFontSelector FINAL : public FontSelector {
 public:
-    static PassRefPtrWillBeRawPtr<CSSFontSelector> create(Document* document)
+    static PassRefPtr<CSSFontSelector> create(Document* document)
     {
-        return adoptRefWillBeNoop(new CSSFontSelector(document));
+        return adoptRef(new CSSFontSelector(document));
     }
     virtual ~CSSFontSelector();
 
     virtual unsigned version() const OVERRIDE { return m_fontFaceCache.version(); }
 
     virtual PassRefPtr<FontData> getFontData(const FontDescription&, const AtomicString&) OVERRIDE;
     virtual void willUseFontData(const FontDescription&, const AtomicString& family) OVERRIDE;
 
     void clearDocument();
 
     void fontLoaded();
 
     // FontCacheClient implementation
     virtual void fontCacheInvalidated() OVERRIDE;
 
     void registerForInvalidationCallbacks(CSSFontSelectorClient*);
 #if !ENABLE(OILPAN)
     void unregisterForInvalidationCallbacks(CSSFontSelectorClient*);
 #endif
 
     Document* document() const { return m_document; }
     FontFaceCache* fontFaceCache() { return &m_fontFaceCache; }
 
     const GenericFontFamilySettings& genericFontFamilySettings() const { return m_genericFontFamilySettings; }
     void updateGenericFontFamilySettings(Document&);
 
     void beginLoadingFontSoon(FontResource*);
     void loadPendingFonts();
 
-    virtual void trace(Visitor*);
-
 private:
     explicit CSSFontSelector(Document*);
 
     void dispatchInvalidationCallbacks();
 
     Document* m_document;
     // FIXME: Move to Document or StyleEngine.
     FontFaceCache m_fontFaceCache;
-    WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients;
+    WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> > m_clients;
 
     FontLoader m_fontLoader;
     GenericFontFamilySettings m_genericFontFamilySettings;
 };
 
 } // namespace WebCore
 
 #endif // CSSFontSelector_h