Changeset 126320 in webkit

Timestamp:

Aug 22, 2012 10:56:48 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium/mac] Remove unnecessary checks for OS version <= 10.5. We don't support those
​https://bugs.webkit.org/show_bug.cgi?id=94658

Patch by James Robinson <​jamesr@chromium.org> on 2012-08-22
Reviewed by Tony Chang.

The chromium mac port hasn't supported Leopard for a while now, so remove chromium-specific code that checks
for OS X version <= Leopard.

• platform/graphics/chromium/CrossProcessFontLoading.mm:

(WebCore::FontPlatformData::loadFont):

• platform/graphics/cocoa/FontPlatformDataCocoa.mm:

(WebCore::canSetCascadeListForCustomFont):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/CrossProcessFontLoading.mm (modified) (2 diffs)
• platform/graphics/cocoa/FontPlatformDataCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-22  James Robinson  <jamesr@chromium.org>
+
+        [chromium/mac] Remove unnecessary checks for OS version <= 10.5. We don't support those
+        https://bugs.webkit.org/show_bug.cgi?id=94658
+
+        Reviewed by Tony Chang.
+
+        The chromium mac port hasn't supported Leopard for a while now, so remove chromium-specific code that checks
+        for OS X version <= Leopard.
+
+        * platform/graphics/chromium/CrossProcessFontLoading.mm:
+        (WebCore::FontPlatformData::loadFont):
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::canSetCascadeListForCustomFont):
+
 2012-08-22  W. James MacLean  <wjmaclean@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm

@@ -41 +41 @@
 typedef HashMap<uint32, MemoryActivatedFont*> FontContainerRefMemoryFontHash;
 typedef HashMap<WTF::String, MemoryActivatedFont*> FontNameMemoryFontHash;
-
-// On 10.5, font loading is not blocked by the sandbox and thus there is no
-// need for the cross-process font loading mechanim.
-// On system versions >=10.6 cross-process font loading is required.
-bool OutOfProcessFontLoadingEnabled()
-{
-    static SInt32 systemVersion = 0;
-    if (!systemVersion) {
-        if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr)
-            return false;
-    }
-
-    return systemVersion >= 0x1060;
-}
 
 // Caching:
@@ -200 +186 @@
     outNSFont = nsFont;
     cgFont = CTFontCopyGraphicsFont(toCTFontRef(outNSFont), 0);
-    if (OutOfProcessFontLoadingEnabled() && outNSFont && cgFont && isLastResortFont(cgFont)) {
+    if (outNSFont && cgFont && isLastResortFont(cgFont)) {
         // Release old CGFontRef since it points at the LastResort font which we don't want.
         CFRelease(cgFont);

trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

@@ -248 +248 @@
 static bool canSetCascadeListForCustomFont()
 {
-#if PLATFORM(CHROMIUM)
-    static SInt32 systemVersion;
-    if (!systemVersion) {
-        if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr)
-            return false;
-    }
-
-    return systemVersion >= 0x1060;
-#elif PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
     return true;
 #else