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

Unified Diff: webkit/support/platform_support_mac.mm

Issue 10785047: Remove all the OS X 10.6 SDK forward declarations. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/glue/webmenurunner_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/support/platform_support_mac.mm
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 82d608bfef0c6de79e70ad577da12927427fde90..5d1d89170a7b923e339c05148f137a4c3bc7bbff 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -119,8 +119,6 @@ void AfterInitialize(bool unit_test_mode) {
// webkit.org/b/50709.
};
-#if defined(MAC_OS_X_VERSION_10_6) && \
- MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
NSMutableArray* font_urls = [NSMutableArray array];
NSURL* resources_directory = [[NSBundle mainBundle] resourceURL];
for (unsigned i = 0; i < arraysize(fontFileNames); ++i) {
@@ -137,23 +135,6 @@ void AfterInitialize(bool unit_test_mode) {
DLOG(FATAL) << "Fail to activate fonts.";
CFRelease(errors);
}
-#else
- NSString* resources = [[NSBundle mainBundle] resourcePath];
- for (unsigned i = 0; i < arraysize(fontFileNames); ++i) {
- const char* resource_path = [[resources stringByAppendingPathComponent:
- [NSString stringWithUTF8String:fontFileNames[i]]] UTF8String];
- FSRef resource_ref;
- const UInt8* uint8_resource_path
- = reinterpret_cast<const UInt8*>(resource_path);
- if (FSPathMakeRef(uint8_resource_path, &resource_ref, nil) != noErr) {
- DLOG(FATAL) << "Fail to open " << resource_path;
- }
- if (ATSFontActivateFromFileReference(&resource_ref, kATSFontContextLocal,
- kATSFontFormatUnspecified, 0, kATSOptionFlagsDefault, 0) != noErr) {
- DLOG(FATAL) << "Fail to activate font: " << resource_path;
- }
- }
-#endif
SwizzleNSPasteboard();
« no previous file with comments | « webkit/glue/webmenurunner_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698