Changeset 148261 in webkit

Timestamp:

Apr 11, 2013 10:03:18 PM (11 years ago)

Author:

thakis@chromium.org

Message:

Remove debugging code that is no longer used with current mac sdks.
​https://bugs.webkit.org/show_bug.cgi?id=114486

Reviewed by Dan Bernstein.

This code compared MAC_OS_X_VERSION_MAX_ALLOWED and friends to
107 and 106 instead of the correct 1070 and 1060. Instead of fixing
this, rip the code out completely: Since WebKit now only targets
current systems, the ifdef is always false anyways.

No tests, as this only removes debugging code.

• platform/graphics/mac/SimpleFontDataMac.mm:

(WebCore::SimpleFontData::platformInit):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Nico Weber  <thakis@chromium.org>
+
+        Remove debugging code that is no longer used with current mac sdks.
+        https://bugs.webkit.org/show_bug.cgi?id=114486
+
+        Reviewed by Dan Bernstein.
+
+        This code compared __MAC_OS_X_VERSION_MAX_ALLOWED and friends to
+        107 and 106 instead of the correct 1070 and 1060. Instead of fixing
+        this, rip the code out completely: Since WebKit now only targets
+        current systems, the ifdef is always false anyways.
+
+        No tests, as this only removes debugging code.
+
+        * platform/graphics/mac/SimpleFontDataMac.mm:
+        (WebCore::SimpleFontData::platformInit):
+
 2013-04-11  Oliver Hunt  <oliver@apple.com>
 

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

@@ -80 +80 @@
 }
 
-#if !ERROR_DISABLED
-#if defined(__LP64__) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 || (__MAC_OS_X_VERSION_MAX_ALLOWED >= 107 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 106)
-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
-
 const SimpleFontData* SimpleFontData::getCompositeFontReferenceFontData(NSFont *key) const
 {
@@ -167 +139 @@
         else
             m_platformData.setFont([NSFont fontWithName:fallbackFontFamily size:m_platformData.size()]);
-#if !ERROR_DISABLED
-        NSString *filePath = pathFromFont(initialFont.get());
-        if (!filePath)
-            filePath = @"not known";
-#endif
         if (!initFontData(this)) {
             if ([fallbackFontFamily isEqual:@"Times New Roman"]) {
@@ -179 +146 @@
                 if (!initFontData(this)) {
                     // We tried, Times, Times New Roman, and the system font. No joy. We have to give up.
-                    LOG_ERROR("unable to initialize with font %@ at %@", initialFont.get(), filePath);
+                    LOG_ERROR("unable to initialize with font %@", initialFont.get());
                     failedSetup = true;
                 }
             } else {
                 // We tried the requested font and the system font. No joy. We have to give up.
-                LOG_ERROR("unable to initialize with font %@ at %@", initialFont.get(), filePath);
+                LOG_ERROR("unable to initialize with font %@", initialFont.get());
                 failedSetup = true;
             }
@@ -190 +157 @@
 
         // Report the problem.
-        LOG_ERROR("Corrupt font detected, using %@ in place of %@ located at \"%@\".",
-            [m_platformData.font() familyName], [initialFont.get() familyName], filePath);
+        LOG_ERROR("Corrupt font detected, using %@ in place of %@.",
+            [m_platformData.font() familyName], [initialFont.get() familyName]);
     }