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

kevino at webkit.org kevino at webkit.org
Wed Dec 22 11:49:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 2ddde62c01adbe62bee4383f3188f8acdde25840
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 9 01:12:00 2010 +0000

    [wx] Build fix, add member needed to compile Mac-specific font code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64958 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ad106d..704bdc8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-08  Kevin Ollivier  <kevino at theolliviers.com>
+
+        [wx] Build fix, add member needed to compile Mac-specific font code.
+
+        * platform/graphics/wx/FontPlatformData.h:
+        (WebCore::FontPlatformData::ctFont):
+
 2010-08-08  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/wx/FontPlatformData.h b/WebCore/platform/graphics/wx/FontPlatformData.h
index 952368e..db74821 100644
--- a/WebCore/platform/graphics/wx/FontPlatformData.h
+++ b/WebCore/platform/graphics/wx/FontPlatformData.h
@@ -157,6 +157,7 @@ public:
     ATSUFontID m_atsuFontID;
     CGFontRef cgFont() const;
     NSFont* nsFont() const { return m_nsFont; }
+    CTFontRef ctFont() const { return reinterpret_cast<CTFontRef>(m_nsFont); }
     void cacheNSFont();
 #endif
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list