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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8d3e48ad2453c17bdb2cd48060c8578c5f297991
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 01:06:59 2010 +0000

    Stop using a QuickDraw function that was only used for debugging purposes.
    
    Reviewed by Darin Adler.
    
    * platform/graphics/mac/SimpleFontDataMac.mm:
    (WebCore::pathFromFont):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66440 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 86678ad..1b5908e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-30  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Darin Adler.
+
+        Stop using a QuickDraw function that was only used for debugging purposes.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::pathFromFont):
+
 2010-08-30  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index 126ef2d..94fcc5e 100644
--- a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -101,11 +101,11 @@ static NSString *webFallbackFontFamily(void)
 }
 
 #if !ERROR_DISABLED
-#ifdef __LP64__
+#if defined(__LP64__) || (!defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
 static NSString* pathFromFont(NSFont*)
 {
-    // FMGetATSFontRefFromFont is not available in 64-bit. As pathFromFont is only used for debugging
-    // purposes, returning nil is acceptable.
+    // FMGetATSFontRefFromFont is not available. As pathFromFont is only used for debugging purposes,
+    // returning nil is acceptable.
     return nil;
 }
 #else

-- 
WebKit Debian packaging