Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Side by Side Diff: Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm

Issue 13905007: Remove the last remaining PLATFORM() bits from WebCore. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fffffffffff Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005, 2006, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2006, 2010, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2006 Alexey Proskuryakov 3 * Copyright (C) 2006 Alexey Proskuryakov
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 return true; 73 return true;
74 } 74 }
75 75
76 static NSString *webFallbackFontFamily(void) 76 static NSString *webFallbackFontFamily(void)
77 { 77 {
78 DEFINE_STATIC_LOCAL(RetainPtr<NSString>, webFallbackFontFamily, ([[NSFont sy stemFontOfSize:16.0f] familyName])); 78 DEFINE_STATIC_LOCAL(RetainPtr<NSString>, webFallbackFontFamily, ([[NSFont sy stemFontOfSize:16.0f] familyName]));
79 return webFallbackFontFamily.get(); 79 return webFallbackFontFamily.get();
80 } 80 }
81 81
82 #if !ERROR_DISABLED 82 #if !ERROR_DISABLED
83 #if defined(__LP64__) || PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 107 0 || (__MAC_OS_X_VERSION_MAX_ALLOWED >= 107 && __MAC_OS_X_VERSION_MIN_REQUIRED > = 106) 83 #if defined(__LP64__) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 || (__MAC_OS_X_ VERSION_MAX_ALLOWED >= 1070 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
84 static NSString* pathFromFont(NSFont*) 84 static NSString* pathFromFont(NSFont*)
85 { 85 {
86 // FMGetATSFontRefFromFont is not available. As pathFromFont is only used fo r debugging purposes, 86 // FMGetATSFontRefFromFont is not available. As pathFromFont is only used fo r debugging purposes,
87 // returning nil is acceptable. 87 // returning nil is acceptable.
88 return nil; 88 return nil;
89 } 89 }
90 #else 90 #else
91 static NSString* pathFromFont(NSFont *font) 91 static NSString* pathFromFont(NSFont *font)
92 { 92 {
93 ATSFontRef atsFont = FMGetATSFontRefFromFont(CTFontGetPlatformFont(toCTFontR ef(font), 0)); 93 ATSFontRef atsFont = FMGetATSFontRefFromFont(CTFontGetPlatformFont(toCTFontR ef(font), 0));
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 RetainPtr<CGFontRef> runCGFont(AdoptCF, CTFontCopyGraphicsFont(runFont, 0)); 457 RetainPtr<CGFontRef> runCGFont(AdoptCF, CTFontCopyGraphicsFont(runFont, 0));
458 if (!CFEqual(runCGFont.get(), cgFont.get())) 458 if (!CFEqual(runCGFont.get(), cgFont.get()))
459 return false; 459 return false;
460 } 460 }
461 461
462 addResult.iterator->value = true; 462 addResult.iterator->value = true;
463 return true; 463 return true;
464 } 464 }
465 465
466 } // namespace WebCore 466 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698