1 files changed, 18 insertions, 57 deletions

diff --git a/WebCore/platform/graphics/win/FontPlatformData.h b/WebCore/platform/graphics/win/FontPlatformData.h
index 5bbda2f..15d23cd 100644
--- a/WebCore/platform/graphics/win/FontPlatformData.h
+++ b/WebCore/platform/graphics/win/FontPlatformData.h
@@ -2,7 +2,7 @@
  * This file is part of the internal font implementation.  It should not be included by anyone other than
  * FontMac.cpp, FontWin.cpp and Font.cpp.
  *
- * Copyright (C) 2006, 2007, 2008 Apple Inc.
+ * Copyright (C) 2006, 2007 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -26,12 +26,8 @@
 
 #include "StringImpl.h"
 
-#if PLATFORM(CAIRO)
-#include <cairo-win32.h>
-#endif
-
-typedef struct HFONT__* HFONT;
-typedef struct CGFont* CGFontRef;
+typedef struct HFONT__ *HFONT;
+typedef struct CGFont *CGFontRef;
 
 namespace WebCore {
 
@@ -44,53 +40,30 @@ public:
 
     // Used for deleted values in the font cache's hash tables.
     FontPlatformData(Deleted)
-        : m_font((HFONT)-1)
-#if PLATFORM(CG)
-        , m_cgFont(0)
-#elif PLATFORM(CAIRO)
-        , m_fontFace(0)
-#endif
-        , m_size(0)
-        , m_syntheticBold(false)
-        , m_syntheticOblique(false)
-        , m_useGDI(false)
-    {
-    }
+    : m_font((HFONT)-1)
+    , m_cgFont(NULL)
+    , m_size(0)
+    , m_syntheticBold(false)
+    , m_syntheticOblique(false)
+    , m_useGDI(false)
+    {}
 
     FontPlatformData()
-        : m_font(0)
-#if PLATFORM(CG)
-        , m_cgFont(0)
-#elif PLATFORM(CAIRO)
-        , m_fontFace(0)
-#endif
-        , m_size(0)
-        , m_syntheticBold(false)
-        , m_syntheticOblique(false)
-        , m_useGDI(false)
-    {
-    }
+    : m_font(0)
+    , m_cgFont(NULL)
+    , m_size(0)
+    , m_syntheticBold(false)
+    , m_syntheticOblique(false)
+    , m_useGDI(false)
+    {}
 
     FontPlatformData(HFONT, float size, bool bold, bool oblique, bool useGDI);
     FontPlatformData(float size, bool bold, bool oblique);
-
-#if PLATFORM(CG)
     FontPlatformData(CGFontRef, float size, bool bold, bool oblique);
-#elif PLATFORM(CAIRO)
-    FontPlatformData(cairo_font_face_t*, float size, bool bold, bool oblique);
-#endif
     ~FontPlatformData();
 
-    void platformDataInit(HFONT font, float size, HDC hdc, WCHAR* faceName);
-
     HFONT hfont() const { return m_font; }
-#if PLATFORM(CG)
     CGFontRef cgFont() const { return m_cgFont; }
-#elif PLATFORM(CAIRO)
-    void setFont(cairo_t* ft) const;
-    cairo_font_face_t* fontFace() const { return m_fontFace; }
-    cairo_scaled_font_t* scaledFont() const { return m_scaledFont; }
-#endif
 
     float size() const { return m_size; }
     void setSize(float size) { m_size = size; }
@@ -105,26 +78,14 @@ public:
 
     bool operator==(const FontPlatformData& other) const
     { 
-        return m_font == other.m_font &&
-#if PLATFORM(CG)
-               m_cgFont == other.m_cgFont &&
-#elif PLATFORM(CAIRO)
-               m_fontFace == other.m_fontFace &&
-               m_scaledFont == other.m_scaledFont &&
-#endif
-               m_size == other.m_size &&
+        return m_font == other.m_font && m_cgFont ==other.m_cgFont && m_size == other.m_size &&
                m_syntheticBold == other.m_syntheticBold && m_syntheticOblique == other.m_syntheticOblique &&
                m_useGDI == other.m_useGDI;
     }
 
 private:
     HFONT m_font;
-#if PLATFORM(CG)
     CGFontRef m_cgFont;
-#elif PLATFORM(CAIRO)
-    cairo_font_face_t* m_fontFace;
-    cairo_scaled_font_t* m_scaledFont;
-#endif
 
     float m_size;
     bool m_syntheticBold;