Remove GDI font rendering code for windows

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 23 matching lines @@
 #include "platform/PlatformExport.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 #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 {
 
 class FontCacheClient;
 class FontPlatformData;
 class FontData;
 class FontDescription;
 class OpenTypeVerticalData;
 class SimpleFontData;
@@ skipping 25 matching lines @@
     void addClient(FontCacheClient*);
     void removeClient(FontCacheClient*);
 
     unsigned short generation();
     void invalidate();
 
 #if OS(WIN)
     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
 
 #if ENABLE(OPENTYPE_VERTICAL)
     typedef uint32_t FontFileKey;
     PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
 #endif
 
 #if OS(ANDROID)
@@ skipping 28 matching lines @@
     FontPlatformData* createFontPlatformData(const FontDescription&, const AtomicString& family, float fontSize);
 
     // Implemented on skia platforms.
     PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const AtomicString& family, CString& name);
 
     PassRefPtr<SimpleFontData> fontDataFromFontPlatformData(const FontPlatformData*, ShouldRetain = Retain);
 
     // 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
 
 #if OS(MACOSX) || OS(ANDROID)
     friend class ComplexTextController;
 #endif
     friend class SimpleFontData; // For fontDataFromFontPlatformData
     friend class FontFallbackList;
 };
 
 class PLATFORM_EXPORT FontCachePurgePreventer {
 public:
     FontCachePurgePreventer() { FontCache::fontCache()->disablePurging(); }
     ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
 };
 
 }
 
 #endif