Changeset 102535 in webkit
- Timestamp:
- Dec 10, 2011 10:20:32 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r102532 r102535 1 2011-12-10 Benjamin Poulain <bpoulain@apple.com> 2 3 #ifdef the parts of the Mac platform which should not be used on iOS 4 https://bugs.webkit.org/show_bug.cgi?id=74246 5 6 Reviewed by David Kilzer. 7 8 * Configurations/WebCore.xcconfig: 9 * platform/FileSystem.cpp: 10 * platform/mac/FileSystemMac.mm: 11 * platform/mac/Language.mm: 12 (+[WebLanguageChangeObserver _webkit_languagePreferencesDidChange]): 13 (WebCore::createHTTPStyleLanguageCode): 14 (WebCore::platformDefaultLanguage): 15 * platform/mac/LocalizedStringsMac.mm: 16 (WebCore::localizedString): 17 (+[WebCoreSharedBufferData initialize]): 18 * platform/mac/WebCoreNSStringExtras.h: 19 * platform/mac/WebCoreNSStringExtras.mm: 20 * platform/mac/WebFontCache.mm: 21 * platform/mac/WebNSAttributedStringExtras.mm: The value NSAttachmentCharacter is 22 not defined in the iOS SDK so we add it here. 23 1 24 2011-12-10 Ryosuke Niwa <rniwa@webkit.org> 2 25 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r102097 r102535 82 82 83 83 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(REAL_PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_SVG_DOM_OBJC_BINDINGS); 84 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm localizedStrings.js;84 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png Cursor.cpp CursorMac.mm HTMLConverter.mm MemoryPressureHandlerMac.mm SSLKeyGeneratorMac.cpp SearchPopupMenuMac.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm localizedStrings.js; 85 85 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos); 86 86 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm -
trunk/Source/WebCore/platform/FileSystem.cpp
r95901 r102535 101 101 } 102 102 103 #if !PLATFORM(MAC) 103 #if !PLATFORM(MAC) || PLATFORM(IOS) 104 104 105 105 bool canExcludeFromBackup() -
trunk/Source/WebCore/platform/mac/FileSystemMac.mm
r85036 r102535 33 33 #import <wtf/RetainPtr.h> 34 34 #import <wtf/text/CString.h> 35 #import <wtf/UnusedParam.h>36 35 37 36 namespace WebCore { … … 67 66 } 68 67 68 #if !PLATFORM(IOS) 69 69 bool canExcludeFromBackup() 70 70 { … … 78 78 return true; 79 79 } 80 #endif 80 81 81 82 } // namespace WebCore -
trunk/Source/WebCore/platform/mac/Language.mm
r95448 r102535 1 1 /* 2 * Copyright (C) 2003, 2005, 2006, 2010 Apple Inc. All rights reserved.2 * Copyright (C) 2003, 2005, 2006, 2010, 2011 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 103 103 NSString *code = [[preferredLanguageCode retain] autorelease]; 104 104 105 #if !PLATFORM(IOS) 105 106 static bool languageChangeObserverAdded; 106 107 if (!languageChangeObserverAdded) { … … 111 112 languageChangeObserverAdded = true; 112 113 } 114 #endif // !PLATFORM(IOS) 113 115 114 116 return code; -
trunk/Source/WebCore/platform/mac/LocalizedStringsMac.mm
r95901 r102535 38 38 static NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebCore"]; 39 39 40 #if !PLATFORM(IOS) 41 // Can be called on a dispatch queue when initializing strings on iOS. 42 // See LoadWebLocalizedStrings and <rdar://problem/7902473>. 40 43 ASSERT(isMainThread()); 44 #endif 41 45 42 46 RetainPtr<CFStringRef> keyString(AdoptCF, CFStringCreateWithCStringNoCopy(NULL, key, kCFStringEncodingUTF8, kCFAllocatorNull)); -
trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.h
r85501 r102535 44 44 BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring); 45 45 NSString *filenameByFixingIllegalCharacters(NSString *string); 46 #if !PLATFORM(IOS) 46 47 CFStringEncoding stringEncodingForResource(Handle resource); 48 #endif 47 49 48 50 #ifdef __cplusplus -
trunk/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm
r100872 r102535 69 69 } 70 70 71 #if !PLATFORM(IOS) 72 71 73 #if COMPILER(CLANG) 72 74 #pragma clang diagnostic push … … 119 121 #pragma clang diagnostic pop 120 122 #endif 123 124 #endif // !PLATFORM(IOS) -
trunk/Source/WebCore/platform/mac/WebFontCache.mm
r85036 r102535 302 302 } 303 303 304 #if !PLATFORM(IOS) 304 305 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)desiredTraits size:(float)size 305 306 { … … 307 308 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desiredWeight size:size]; 308 309 } 310 #endif 309 311 310 312 @end -
trunk/Source/WebCore/platform/mac/WebNSAttributedStringExtras.mm
r83000 r102535 24 24 */ 25 25 26 #import "config.h" 26 27 #import "WebNSAttributedStringExtras.h" 28 29 #if PLATFORM(IOS) 30 enum { 31 NSAttachmentCharacter = 0xfffc /* To denote attachments. */ 32 }; 33 #endif 27 34 28 35 namespace WebCore {
Note: See TracChangeset
for help on using the changeset viewer.