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

mitz at apple.com mitz at apple.com
Wed Dec 22 12:23:47 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 4a1ae2fdcabef24952b67a273e7ba0d878cba8c9
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 20 23:03:17 2010 +0000

    #ifdef-out some Leopard-and-earlier code.
    
    Reviewed by Dave Kilzer.
    
    * platform/graphics/mac/FontCustomPlatformData.cpp:
    (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65760 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d67db7..7a0c8e4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-20  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Dave Kilzer.
+
+        #ifdef-out some Leopard-and-earlier code.
+
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::~FontCustomPlatformData):
+
 2010-08-20  Kenneth Russell  <kbr at google.com>
 
         Unreviewed, speculative Chromium build fix. Forward declare
diff --git a/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp b/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
index c591ddc..a600d73 100644
--- a/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
+++ b/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
@@ -31,8 +31,10 @@ namespace WebCore {
 
 FontCustomPlatformData::~FontCustomPlatformData()
 {
+#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD)
     if (m_atsContainer)
         ATSFontDeactivate(m_atsContainer, NULL, kATSOptionFlagsDefault);
+#endif
     CGFontRelease(m_cgFont);
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list