Revert of Add plumbing in blink to allow overriding the default font collection.

third_party/WebKit/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 54 matching lines @@
 #endif // !OS(WIN)
 
 typedef HashMap<FontCacheKey, OwnPtr<FontPlatformData>, FontCacheKeyHash, FontCacheKeyTraits> FontPlatformDataCache;
 typedef HashMap<FallbackListCompositeKey, OwnPtr<ShapeCache>, FallbackListCompositeKeyHash, FallbackListCompositeKeyTraits> FallbackListShaperCache;
 
 static FontPlatformDataCache* gFontPlatformDataCache = nullptr;
 static FallbackListShaperCache* gFallbackListShaperCache = nullptr;
 
 #if OS(WIN)
 bool FontCache::s_useDirectWrite = false;
-SkFontMgr* FontCache::s_fontManager = nullptr;
+IDWriteFactory* FontCache::s_directWriteFactory = 0;
 bool FontCache::s_useSubpixelPositioning = false;
 float FontCache::s_deviceScaleFactor = 1.0;
 #endif // OS(WIN)
 
 FontCache* FontCache::fontCache()
 {
     DEFINE_STATIC_LOCAL(FontCache, globalFontCache, ());
     return &globalFontCache;
 }
 
@@ skipping 53 matching lines @@
 }
 
 typedef HashMap<FontCache::FontFileKey, RefPtr<OpenTypeVerticalData>, IntHash<FontCache::FontFileKey>, UnsignedWithZeroKeyHashTraits<FontCache::FontFileKey>> FontVerticalDataCache;
 
 FontVerticalDataCache& fontVerticalDataCacheInstance()
 {
     DEFINE_STATIC_LOCAL(FontVerticalDataCache, fontVerticalDataCache, ());
     return fontVerticalDataCache;
 }
 
-#if OS(WIN)
-void FontCache::setFontManager(const RefPtr<SkFontMgr>& fontManager)
-{
-    ASSERT(!s_fontManager);
-    s_fontManager = fontManager.get();
-    // Explicitly AddRef since we're going to hold on to the object for the life of the program.
-    s_fontManager->ref();
-}
-#endif
-
 PassRefPtr<OpenTypeVerticalData> FontCache::getVerticalData(const FontFileKey& key, const FontPlatformData& platformData)
 {
     FontVerticalDataCache& fontVerticalDataCache = fontVerticalDataCacheInstance();
     FontVerticalDataCache::iterator result = fontVerticalDataCache.find(key);
     if (result != fontVerticalDataCache.end())
         return result.get()->value;
 
     RefPtr<OpenTypeVerticalData> verticalData = OpenTypeVerticalData::create(platformData);
     if (!verticalData->isOpenType())
         verticalData.clear();
@@ skipping 198 matching lines @@
         iter != gFallbackListShaperCache->end();
         ++iter) {
         shapeResultCacheSize += iter->value->byteSize();
     }
     dump->addScalar("size", "bytes", shapeResultCacheSize);
     memoryDump->addSuballocation(dump->guid(), String(WTF::Partitions::kAllocatedObjectPoolName));
 }
 
 
 } // namespace blink