Remove GDI font rendering code for windows

Source/platform/fonts/FontCache.h

Index: Source/platform/fonts/FontCache.h
diff --git a/Source/platform/fonts/FontCache.h b/Source/platform/fonts/FontCache.h
index aa53569d5f1918970f7553cef693a70db41bf49d..55396e4d398eb57c11aad7d4e10f49146fd2f9fa 100644
--- a/Source/platform/fonts/FontCache.h
+++ b/Source/platform/fonts/FontCache.h
@@ -41,15 +41,12 @@
 #include "wtf/unicode/Unicode.h"
 
 #if OS(WIN)
+#include "SkFontMgr.h"
 #include <windows.h>
 #include <objidl.h>
 #include <mlang.h>
 #endif
 
-#if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)
-#include "SkFontMgr.h"
-#endif
-
 class SkTypeface;
 
 namespace WebCore {
@@ -95,7 +92,7 @@ public:
     PassRefPtr<SimpleFontData> fontDataFromDescriptionAndLogFont(const FontDescription&, ShouldRetain, const LOGFONT&, wchar_t* outFontFamilyName);
 #endif
 
-#if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)
+#if OS(WIN)
     bool useSubpixelPositioning() const { return m_useSubpixelPositioning; }
     SkFontMgr* fontManager() { return m_fontManager.get(); }
 #endif
@@ -144,7 +141,7 @@ private:
     // Don't purge if this count is > 0;
     int m_purgePreventCount;
 
-#if OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)
+#if OS(WIN)
     OwnPtr<SkFontMgr> m_fontManager;
     bool m_useSubpixelPositioning;
 #endif