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

Source/platform/fonts/FontFallbackList.h

 /*
  * Copyright (C) 2006, 2010 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 49 matching lines @@
 
     private:
         FontFallbackList& m_fallbackList;
         GlyphPages& m_pages;
         GlyphPageTreeNode* m_pageZero;
     };
 
     static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallbackList()); }
 
     ~FontFallbackList() { releaseFontData(); }
-    void invalidate(PassRefPtrWillBeRawPtr<FontSelector>);
+    void invalidate(PassRefPtr<FontSelector>);
 
     bool isFixedPitch(const FontDescription& fontDescription) const
     {
         if (m_pitch == UnknownPitch)
             determinePitch(fontDescription);
         return m_pitch == FixedPitch;
     }
     void determinePitch(const FontDescription&) const;
 
     bool loadingCustomFonts() const;
@@ skipping 21 matching lines @@
 
     const FontData* primaryFontData(const FontDescription&) const;
     const FontData* fontDataAt(const FontDescription&, unsigned index) const;
 
     void releaseFontData();
 
     mutable Vector<RefPtr<FontData>, 1> m_fontList;
     mutable GlyphPages m_pages;
     mutable GlyphPageTreeNode* m_pageZero;
     mutable const SimpleFontData* m_cachedPrimarySimpleFontData;
-    RefPtrWillBePersistent<FontSelector> m_fontSelector;
+    RefPtr<FontSelector> m_fontSelector;
     mutable WidthCache m_widthCache;
     unsigned m_fontSelectorVersion;
     mutable int m_familyIndex;
     unsigned short m_generation;
     mutable unsigned m_pitch : 3; // Pitch
     mutable bool m_hasLoadingFallback : 1;
 
     friend class Font;
 };
 
 }
 
 #endif