Changeset 126320 in webkit
- Timestamp:
- Aug 22, 2012 10:56:48 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r126319 r126320 1 2012-08-22 James Robinson <jamesr@chromium.org> 2 3 [chromium/mac] Remove unnecessary checks for OS version <= 10.5. We don't support those 4 https://bugs.webkit.org/show_bug.cgi?id=94658 5 6 Reviewed by Tony Chang. 7 8 The chromium mac port hasn't supported Leopard for a while now, so remove chromium-specific code that checks 9 for OS X version <= Leopard. 10 11 * platform/graphics/chromium/CrossProcessFontLoading.mm: 12 (WebCore::FontPlatformData::loadFont): 13 * platform/graphics/cocoa/FontPlatformDataCocoa.mm: 14 (WebCore::canSetCascadeListForCustomFont): 15 1 16 2012-08-22 W. James MacLean <wjmaclean@chromium.org> 2 17 -
trunk/Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm
r113132 r126320 41 41 typedef HashMap<uint32, MemoryActivatedFont*> FontContainerRefMemoryFontHash; 42 42 typedef HashMap<WTF::String, MemoryActivatedFont*> FontNameMemoryFontHash; 43 44 // On 10.5, font loading is not blocked by the sandbox and thus there is no45 // need for the cross-process font loading mechanim.46 // On system versions >=10.6 cross-process font loading is required.47 bool OutOfProcessFontLoadingEnabled()48 {49 static SInt32 systemVersion = 0;50 if (!systemVersion) {51 if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr)52 return false;53 }54 55 return systemVersion >= 0x1060;56 }57 43 58 44 // Caching: … … 200 186 outNSFont = nsFont; 201 187 cgFont = CTFontCopyGraphicsFont(toCTFontRef(outNSFont), 0); 202 if ( OutOfProcessFontLoadingEnabled() &&outNSFont && cgFont && isLastResortFont(cgFont)) {188 if (outNSFont && cgFont && isLastResortFont(cgFont)) { 203 189 // Release old CGFontRef since it points at the LastResort font which we don't want. 204 190 CFRelease(cgFont); -
trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
r123586 r126320 248 248 static bool canSetCascadeListForCustomFont() 249 249 { 250 #if PLATFORM(CHROMIUM) 251 static SInt32 systemVersion; 252 if (!systemVersion) { 253 if (Gestalt(gestaltSystemVersion, &systemVersion) != noErr) 254 return false; 255 } 256 257 return systemVersion >= 0x1060; 258 #elif PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 250 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 259 251 return true; 260 252 #else
Note: See TracChangeset
for help on using the changeset viewer.