[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mitz at apple.com]

The following commit has been merged in the debian/experimental branch:
commit dc999ca6ba4014bfd82810e0a5201c9aebe487c5
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 8 16:41:58 2010 +0000

    Try to fix the Chromium Mac build after r64915.
    
    * platform/graphics/chromium/FontPlatformDataChromiumMac.mm:
    (WebCore::FontPlatformData::ctFont): Copied from mac/FontPlatformDataMac.mm.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64950 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 40e8b97..25d58b2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-08  Dan Bernstein  <mitz at apple.com>
+
+        Try to fix the Chromium Mac build after r64915.
+
+        * platform/graphics/chromium/FontPlatformDataChromiumMac.mm:
+        (WebCore::FontPlatformData::ctFont): Copied from mac/FontPlatformDataMac.mm.
+
 2010-08-08  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/graphics/chromium/FontPlatformDataChromiumMac.mm b/WebCore/platform/graphics/chromium/FontPlatformDataChromiumMac.mm
index 41f684e..ad7ebba 100644
--- a/WebCore/platform/graphics/chromium/FontPlatformDataChromiumMac.mm
+++ b/WebCore/platform/graphics/chromium/FontPlatformDataChromiumMac.mm
@@ -436,6 +436,17 @@ bool FontPlatformData::allowsLigatures() const
     return ![[m_font coveredCharacterSet] characterIsMember:'a'];
 }
 
+#if USE(CORE_TEXT)
+CTFontRef FontPlatformData::ctFont() const
+{
+    if (m_font)
+        return toCTFontRef(m_font);
+    if (!m_CTFont)
+        m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_size, 0, 0));
+    return m_CTFont.get();
+}
+#endif // USE(CORE_TEXT)
+
 #ifndef NDEBUG
 String FontPlatformData::description() const
 {

-- 
WebKit Debian packaging