Index: Source/platform/fonts/FontCustomPlatformData.h |
diff --git a/Source/platform/fonts/FontCustomPlatformData.h b/Source/platform/fonts/FontCustomPlatformData.h |
index ae7d6b2ba9dd445ed0b6c4f52afc7f412be246b3..e00e83c1f6987450082ea8577d680a9955546e71 100644 |
--- a/Source/platform/fonts/FontCustomPlatformData.h |
+++ b/Source/platform/fonts/FontCustomPlatformData.h |
@@ -39,17 +39,13 @@ |
#include "wtf/Noncopyable.h" |
#include "wtf/text/WTFString.h" |
-#if OS(WIN) && ENABLE(GDI_FONTS_ON_WINDOWS) |
-#include <windows.h> |
-#endif |
- |
#if OS(MACOSX) |
#include "wtf/RetainPtr.h" |
#include <CoreFoundation/CFBase.h> |
typedef struct CGFont* CGFontRef; |
#endif |
-#if OS(MACOSX) || OS(POSIX) || (OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)) |
+#if OS(MACOSX) || OS(POSIX) || OS(WIN) |
#include "wtf/RefPtr.h" |
class SkTypeface; |
#endif |
@@ -70,15 +66,11 @@ public: |
static bool supportsFormat(const String&); |
private: |
-#if OS(WIN) && ENABLE(GDI_FONTS_ON_WINDOWS) |
- FontCustomPlatformData(HANDLE fontReference, const String& name); |
- HANDLE m_fontReference; |
- String m_name; |
-#elif OS(MACOSX) |
+#if OS(MACOSX) |
explicit FontCustomPlatformData(CGFontRef, PassRefPtr<SkTypeface>); |
RetainPtr<CGFontRef> m_cgFont; |
RefPtr<SkTypeface> m_typeface; |
-#elif OS(POSIX) || (OS(WIN) && !ENABLE(GDI_FONTS_ON_WINDOWS)) |
+#elif OS(POSIX) || OS(WIN) |
explicit FontCustomPlatformData(PassRefPtr<SkTypeface>); |
RefPtr<SkTypeface> m_typeface; |
#endif |