Changeset 109146 in webkit

Timestamp:

Feb 28, 2012 1:49:55 PM (12 years ago)

Author:

adamk@chromium.org

Message:

Unreviewed, rolling out r109137.
​http://trac.webkit.org/changeset/109137
​https://bugs.webkit.org/show_bug.cgi?id=79833

Broke cr-mac build (Requested by aklein on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-02-28

• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore):
(WebCore::pathFromFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/SimpleFontDataMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r109137.
+        http://trac.webkit.org/changeset/109137
+        https://bugs.webkit.org/show_bug.cgi?id=79833
+
+        Broke cr-mac build (Requested by aklein on #webkit).
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore):
+        (WebCore::pathFromFont):
+
 2012-02-28  Jungshik Shin  <jshin@chromium.org>
 

trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

@@ -83 +83 @@
 
 #if !ERROR_DISABLED
-static NSString *pathFromFont(NSFont *font)
-{
-    return [[[font fontDescriptor] objectForKey:(NSString *)kCTFontURLAttribute] path];
-}
+#if defined(__LP64__) || (!defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD))
+static NSString* pathFromFont(NSFont*)
+{
+    // FMGetATSFontRefFromFont is not available. As pathFromFont is only used for debugging purposes,
+    // returning nil is acceptable.
+    return nil;
+}
+#else
+static NSString* pathFromFont(NSFont *font)
+{
+    ATSFontRef atsFont = FMGetATSFontRefFromFont(CTFontGetPlatformFont(toCTFontRef(font), 0));
+    FSRef fileRef;
+
+    OSStatus status = ATSFontGetFileReference(atsFont, &fileRef);
+    if (status != noErr)
+        return nil;
+
+    UInt8 filePathBuffer[PATH_MAX];
+    status = FSRefMakePath(&fileRef, filePathBuffer, PATH_MAX);
+    if (status == noErr)
+        return [NSString stringWithUTF8String:(const char*)filePathBuffer];
+
+    return nil;
+}
+#endif // __LP64__
 #endif // !ERROR_DISABLED