1 files changed, 32 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/SimpleFontData.h b/WebCore/platform/graphics/SimpleFontData.h
index b2eec1f..5f26cbf 100644
--- a/WebCore/platform/graphics/SimpleFontData.h
+++ b/WebCore/platform/graphics/SimpleFontData.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the internal font implementation.
  *
- * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -29,7 +29,7 @@
 #include "GlyphWidthMap.h"
 #include <wtf/OwnPtr.h>
 
-#if PLATFORM(MAC)
+#if USE(ATSUI)
 typedef struct OpaqueATSUStyle* ATSUStyle;
 #endif
 
@@ -37,6 +37,10 @@ typedef struct OpaqueATSUStyle* ATSUStyle;
 #include <usp10.h>
 #endif
 
+#if PLATFORM(CAIRO)
+#include <cairo.h>
+#endif
+
 namespace WebCore {
 
 class FontDescription;
@@ -88,6 +92,14 @@ public:
 
 #if PLATFORM(MAC)
     NSFont* getNSFont() const { return m_font.font(); }
+#endif
+
+#if USE(CORE_TEXT)
+    CTFontRef getCTFont() const;
+    CFDictionaryRef getCFStringAttributes() const;
+#endif
+
+#if USE(ATSUI)
     void checkShapesArabic() const;
     bool shapesArabic() const
     {
@@ -106,7 +118,7 @@ public:
     static bool shouldApplyMacAscentHack();
 #endif
 
-#if PLATFORM(GTK)
+#if PLATFORM(CAIRO)
     void setFont(cairo_t*) const;
 #endif
 
@@ -120,6 +132,12 @@ private:
     
     void commonInit();
 
+#if PLATFORM(WIN)
+    void initGDIFont();
+    void platformCommonDestroy();
+    float widthForGDIGlyph(Glyph glyph) const;
+#endif
+
 public:
     int m_ascent;
     int m_descent;
@@ -149,12 +167,17 @@ public:
 
     mutable SimpleFontData* m_smallCapsFontData;
 
-#if PLATFORM(CG)
+#if PLATFORM(CG) || PLATFORM(WIN)
     float m_syntheticBoldOffset;
 #endif
 
 #if PLATFORM(MAC)
+#ifdef BUILDING_ON_TIGER
     void* m_styleGroup;
+#endif
+#endif
+
+#if USE(ATSUI)
     mutable ATSUStyle m_ATSUStyle;
     mutable bool m_ATSUStyleInitialized;
     mutable bool m_ATSUMirrors;
@@ -162,6 +185,11 @@ public:
     mutable bool m_shapesArabic;
 #endif
 
+#if USE(CORE_TEXT)
+    mutable RetainPtr<CTFontRef> m_CTFont;
+    mutable RetainPtr<CFDictionaryRef> m_CFStringAttributes;
+#endif
+
 #if PLATFORM(WIN)
     bool m_isSystemFont;
     mutable SCRIPT_CACHE m_scriptCache;