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

third_party/WebKit/Source/platform/fonts/FontCache.h

 /*
  * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * 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 28 matching lines @@
 #include "wtf/HashMap.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/Unicode.h"
 #include "wtf/text/WTFString.h"
 #include <limits.h>
 
 #if OS(WIN)
 #include "SkFontMgr.h"
+struct IDWriteFactory;
 #endif
 
 class SkTypeface;
 
 namespace blink {
 
 class FontCacheClient;
 class FontFaceCreationParams;
 class FontPlatformData;
 class FontDescription;
@@ skipping 40 matching lines @@
 
     unsigned short generation();
     void invalidate();
 
 #if OS(WIN)
     bool useSubpixelPositioning() const { return s_useSubpixelPositioning; }
     SkFontMgr* fontManager() { return m_fontManager.get(); }
     static bool useDirectWrite() { return s_useDirectWrite; }
     static float deviceScaleFactor() { return s_deviceScaleFactor; }
     static void setUseDirectWrite(bool useDirectWrite) { s_useDirectWrite = useDirectWrite; }
-    static void setFontManager(const RefPtr<SkFontMgr>&);
+    static void setDirectWriteFactory(IDWriteFactory* factory) { s_directWriteFactory = factory; }
     static void setDeviceScaleFactor(float deviceScaleFactor) { s_deviceScaleFactor = deviceScaleFactor; }
     static void setUseSubpixelPositioning(bool useSubpixelPositioning) { s_useSubpixelPositioning = useSubpixelPositioning; }
     static void addSideloadedFontForTesting(SkTypeface*);
     // Functions to cache and retrieve the system font metrics.
     static void setMenuFontMetrics(const wchar_t* familyName, int32_t fontHeight);
     static void setSmallCaptionFontMetrics(const wchar_t* familyName, int32_t fontHeight);
     static void setStatusFontMetrics(const wchar_t* familyName, int32_t fontHeight);
     static int32_t menuFontHeight() { return s_menuFontHeight; }
     static const AtomicString& menuFontFamily() { return *s_smallCaptionFontFamilyName; }
     static int32_t smallCaptionFontHeight() { return s_smallCaptionFontHeight; }
@@ skipping 48 matching lines @@
 
     // Implemented on skia platforms.
     PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
 
     PassRefPtr<SimpleFontData> fallbackOnStandardFontStyle(const FontDescription&, UChar32);
 
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
 #if OS(WIN)
-    RefPtr<SkFontMgr> m_fontManager;
+    OwnPtr<SkFontMgr> m_fontManager;
     static bool s_useDirectWrite;
-    static SkFontMgr* s_fontManager;
+    static IDWriteFactory* s_directWriteFactory;
     static float s_deviceScaleFactor;
     static bool s_useSubpixelPositioning;
     static HashMap<String, RefPtr<SkTypeface>>* s_sideloadedFonts;
     // The system font metrics cache.
     static AtomicString* s_menuFontFamilyName;
     static int32_t s_menuFontHeight;
     static AtomicString* s_smallCaptionFontFamilyName;
     static int32_t s_smallCaptionFontHeight;
     static AtomicString* s_statusFontFamilyName;
     static int32_t s_statusFontHeight;
 #endif
 
     friend class SimpleFontData; // For fontDataFromFontPlatformData
     friend class FontFallbackList;
 };
 
 class PLATFORM_EXPORT FontCachePurgePreventer {
     USING_FAST_MALLOC(FontCachePurgePreventer);
     WTF_MAKE_NONCOPYABLE(FontCachePurgePreventer);
 public:
     FontCachePurgePreventer() { FontCache::fontCache()->disablePurging(); }
     ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
 };
 
 } // namespace blink
 
 #endif