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

Source/core/css/CSSFontSelector.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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
@@ skipping 103 matching lines @@
 
     ASSERT(m_document);
     ASSERT(m_document->frame());
     FontCache::fontCache()->addClient(this);
     FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache, this);
 }
 
 CSSFontSelector::~CSSFontSelector()
 {
     clearDocument();
-#if !ENABLE(OILPAN)
     FontCache::fontCache()->removeClient(this);
-#endif
 }
 
 void CSSFontSelector::registerForInvalidationCallbacks(CSSFontSelectorClient* client)
 {
     m_clients.add(client);
 }
 
 #if !ENABLE(OILPAN)
 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient* client)
 {
@@ skipping 85 matching lines @@
 {
     m_fontLoader.loadPendingFonts();
 }
 
 void CSSFontSelector::updateGenericFontFamilySettings(Document& document)
 {
     ASSERT(document.settings());
     m_genericFontFamilySettings = document.settings()->genericFontFamilySettings();
 }
 
-void CSSFontSelector::trace(Visitor* visitor)
-{
-    visitor->trace(m_fontFaceCache);
-    visitor->trace(m_clients);
-    visitor->trace(m_fontLoader);
 }
-
-}