64-bit build fix
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Jan 2008 23:03:18 +0000 (23:03 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 7 Jan 2008 23:03:18 +0000 (23:03 +0000)
        * platform/graphics/mac/FontCustomPlatformData.cpp:
        (WebCore::FontCustomPlatformData::fontPlatformData): Have to use a
        cast here since FMGetFontFromATSFontRef() is not available on 64-bit.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/graphics/mac/FontCustomPlatformData.cpp

index 23dd0962e70a6d07096149b4d06bb3dc77db0405..e0f528856982cf3edfb679b77a66eb33945eedb3 100644 (file)
@@ -1,3 +1,11 @@
+2008-01-07  Dan Bernstein  <mitz@apple.com>
+
+        64-bit build fix
+
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData): Have to use a
+        cast here since FMGetFontFromATSFontRef() is not available on 64-bit.
+
 2008-01-06  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver. Parts reviewed by Eric, David Hyatt & Dan & Alexey.
 2008-01-06  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Oliver. Parts reviewed by Eric, David Hyatt & Dan & Alexey.
index 0f61e9a2505e8904cd7aeec9a48d51a02729c90b..439af5049c19fba218c4e046d208d39a521145e7 100644 (file)
@@ -35,7 +35,7 @@ FontCustomPlatformData::~FontCustomPlatformData()
 
 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic)
 {
 
 FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, bool italic)
 {
-    return FontPlatformData(m_cgFont, FMGetFontFromATSFontRef(m_atsFont), size, bold, italic);
+    return FontPlatformData(m_cgFont, (ATSUFontID)m_atsFont, size, bold, italic);
 }
 
 FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)
 }
 
 FontCustomPlatformData* createFontCustomPlatformData(SharedBuffer* buffer)