Changeset 190841 in webkit
- Timestamp:
- Oct 10, 2015 1:05:53 PM (8 years ago)
- Location:
- trunk
- Files:
-
- 66 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r190837 r190841 1 2015-10-10 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Remove unnecessary iOS version checks 4 https://bugs.webkit.org/show_bug.cgi?id=150002 5 6 Reviewed by Alexey Proskuryakov. 7 8 * llvm/library/LLVMExports.cpp: 9 (initializeAndGetJSCLLVMAPI): 10 1 11 2015-10-10 Dan Bernstein <mitz@apple.com> 2 12 -
trunk/Source/JavaScriptCore/llvm/library/LLVMExports.cpp
r186923 r190841 94 94 LLVMInitializeX86Disassembler(); 95 95 #elif CPU(ARM64) 96 #if (__IPHONE_OS_VERSION_MIN_REQUIRED > 80200) || OS(LINUX)96 #if PLATFORM(IOS) || OS(LINUX) 97 97 LLVMInitializeAArch64TargetInfo(); 98 98 LLVMInitializeAArch64Target(); -
trunk/Source/WTF/ChangeLog
r190837 r190841 1 2015-10-10 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Remove unnecessary iOS version checks 4 https://bugs.webkit.org/show_bug.cgi?id=150002 5 6 Reviewed by Alexey Proskuryakov. 7 8 * wtf/Platform.h: 9 1 10 2015-10-10 Dan Bernstein <mitz@apple.com> 2 11 -
trunk/Source/WTF/wtf/Platform.h
r190182 r190841 556 556 #endif 557 557 558 #if defined(TARGET_OS_IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000558 #if TARGET_OS_IOS 559 559 #define HAVE_APP_LINKS 1 560 560 #endif … … 987 987 #endif 988 988 989 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)989 #if PLATFORM(IOS) || PLATFORM(MAC) 990 990 #define USE_COREMEDIA 1 991 991 #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1 992 992 #endif 993 993 994 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)994 #if PLATFORM(IOS) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080) 995 995 #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1 996 996 #endif 997 997 998 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)998 #if PLATFORM(IOS) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090) 999 999 #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1 1000 1000 #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1 1001 1001 #endif 1002 1002 1003 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)1003 #if PLATFORM(IOS) || PLATFORM(MAC) 1004 1004 #define HAVE_AVFOUNDATION_LOADER_DELEGATE 1 1005 1005 #endif … … 1060 1060 #endif 1061 1061 1062 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)1062 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS) 1063 1063 #define HAVE_TIMINGDATAOPTIONS 1 1064 1064 #endif … … 1118 1118 #endif 1119 1119 1120 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 900001120 #if PLATFORM(IOS) 1121 1121 #define ENABLE_VIDEO_PRESENTATION_MODE 1 1122 1122 #endif -
trunk/Source/WebCore/ChangeLog
r190840 r190841 1 2015-10-10 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Remove unnecessary iOS version checks 4 https://bugs.webkit.org/show_bug.cgi?id=150002 5 6 Reviewed by Alexey Proskuryakov. 7 8 * loader/cache/CachedFont.cpp: 9 (WebCore::CachedFont::ensureCustomFontData): 10 * loader/cocoa/DiskCacheMonitorCocoa.h: 11 (WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation): 12 * page/mac/SettingsMac.mm: 13 (WebCore::sansSerifTraditionalHanFontFamily): 14 (WebCore::sansSerifSimplifiedHanFontFamily): 15 * platform/graphics/cocoa/FontCacheCoreText.cpp: 16 (WebCore::appendOpenTypeFeature): 17 * platform/graphics/ios/FontCacheIOS.mm: 18 (WebCore::getSystemFontFallbackForCharacters): 19 (WebCore::platformLookupFallbackFont): 20 * platform/ios/PlatformSpeechSynthesizerIOS.mm: 21 (WebCore::PlatformSpeechSynthesizer::initializeVoiceList): 22 * platform/ios/WebCoreSystemInterfaceIOS.h: 23 * platform/ios/WebVideoFullscreenControllerAVKit.mm: 24 * platform/ios/WebVideoFullscreenInterfaceAVKit.h: 25 * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: 26 * platform/ios/wak/WAKWindow.mm: 27 (+[WAKWindow hasLandscapeOrientation]): 28 (-[WAKWindow hostLayer]): 29 * platform/network/cf/CookieJarCFNet.cpp: 30 (WebCore::copyCookiesForURLWithFirstPartyURL): 31 (WebCore::createCookies): 32 * platform/network/mac/CertificateInfoMac.mm: 33 (WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate): 34 * platform/spi/cf/CFNetworkSPI.h: 35 * platform/spi/cocoa/AVKitSPI.h: 36 * platform/spi/cocoa/CoreTextSPI.h: 37 * platform/spi/cocoa/NEFilterSourceSPI.h: 38 * platform/spi/cocoa/QuartzCoreSPI.h: 39 * platform/spi/cocoa/SecuritySPI.h: 40 * platform/spi/ios/LaunchServicesSPI.h: 41 * platform/spi/mac/AVFoundationSPI.h: 42 * platform/text/TextBreakIterator.cpp: 43 * platform/text/TextFlags.h: 44 * platform/text/ios/LocalizedDateCache.mm: 45 (WebCore::LocalizedDateCache::calculateMaximumWidth): 46 * platform/text/mac/LocaleMac.mm: 47 (WebCore::LocaleMac::LocaleMac): 48 * rendering/RenderThemeIOS.mm: 49 (WebCore::RenderThemeIOS::cachedSystemFontDescription): 50 (WebCore::RenderThemeIOS::updateCachedSystemFontDescription): 51 * svg/SVGToOTFFontConversion.cpp: 52 (WebCore::SVGToOTFFontConverter::appendKERNTable): 53 (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter): 54 1 55 2015-10-10 Antti Koivisto <antti@apple.com> 2 56 -
trunk/Source/WebCore/loader/cache/CachedFont.cpp
r188130 r190841 103 103 RefPtr<SharedBuffer> buffer(data); 104 104 105 #if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)105 #if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && !PLATFORM(IOS) 106 106 if (isWOFF(buffer.get())) { 107 107 Vector<char> convertedFont; -
trunk/Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h
r175549 r190841 56 56 }; 57 57 58 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090)58 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090 59 59 60 60 inline void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef) -
trunk/Source/WebCore/page/mac/SettingsMac.mm
r186021 r190841 31 31 static inline const char* sansSerifTraditionalHanFontFamily() 32 32 { 33 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)33 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS) 34 34 return "PingFang TC"; 35 35 #else … … 40 40 static inline const char* sansSerifSimplifiedHanFontFamily() 41 41 { 42 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)42 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS) 43 43 return "PingFang SC"; 44 44 #else -
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r190754 r190841 134 134 static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature) 135 135 { 136 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)136 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS) 137 137 RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontFeatureTag::value_type), kCFStringEncodingASCII, false)); 138 138 int rawFeatureValue = feature.value(); -
trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
r189951 r190841 83 83 // FIXME: Unify this with platformLookupFallbackFont() 84 84 RetainPtr<CFStringRef> localeString; 85 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 9000086 85 if (!locale.isNull()) 87 86 localeString = locale.string().createCFString(); 88 #else89 UNUSED_PARAM(locale);90 #endif91 87 92 88 CFIndex coveredLength = 0; … … 100 96 return getSystemFontFallbackForCharacters(font, locale, characters, length); 101 97 102 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000103 98 RetainPtr<CFStringRef> localeString; 104 99 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 … … 107 102 #endif 108 103 RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(font, characters, length, localeString.get(), nullptr)); 109 #else110 RetainPtr<CTFontRef> fallbackFont = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, nullptr, nullptr));111 RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCopyFontDescriptor(fallbackFont.get()));112 #endif113 104 UChar32 c = *characters; 114 105 if (length > 1 && U16_IS_LEAD(c) && U16_IS_TRAIL(characters[1])) -
trunk/Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm
r186279 r190841 250 250 NSString *language = [voice language]; 251 251 bool isDefault = true; 252 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000253 252 NSString *voiceURI = [voice identifier]; 254 253 NSString *name = [voice name]; 255 #else256 NSString *voiceURI = language;257 NSString *name = language;258 #endif259 254 m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault)); 260 255 } -
trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h
r185472 r190841 34 34 wkIOSSystemVersion_5_0 = __IPHONE_5_0, 35 35 wkIOSSystemVersion_6_0 = __IPHONE_6_0, 36 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000037 36 wkIOSSystemVersion_9_0 = __IPHONE_9_0, 38 #endif39 37 } wkIOSSystemVersion; 40 38 -
trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
r187491 r190841 47 47 using namespace WebCore; 48 48 49 #if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 ||!HAVE(AVKIT)49 #if !HAVE(AVKIT) 50 50 51 51 @implementation WebVideoFullscreenController … … 639 639 @end 640 640 641 #endif // __IPHONE_OS_VERSION_MIN_REQUIRED < 80000641 #endif // !HAVE(AVKIT) 642 642 643 643 #endif // PLATFORM(IOS) -
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
r187617 r190841 28 28 #define WebVideoFullscreenInterfaceAVKit_h 29 29 30 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 8000030 #if PLATFORM(IOS) 31 31 32 32 #include <WebCore/EventListener.h> -
trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
r190336 r190841 27 27 #import "config.h" 28 28 29 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 80200 &&HAVE(AVKIT)29 #if PLATFORM(IOS) && HAVE(AVKIT) 30 30 31 31 #import "WebVideoFullscreenInterfaceAVKit.h" -
trunk/Source/WebCore/platform/ios/wak/WAKWindow.mm
r188169 r190841 45 45 46 46 @protocol OrientationProvider 47 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 6000048 47 - (BOOL)hasLandscapeOrientation; 49 #else50 - (int)orientation;51 #endif52 48 @end 53 49 … … 622 618 { 623 619 // this should be perfectly thread safe 624 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000625 620 return [gOrientationProvider hasLandscapeOrientation]; 626 #else627 int orientation = [gOrientationProvider orientation];628 return orientation == 90 || orientation == -90;629 #endif630 621 } 631 622 -
trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
r187490 r190841 43 43 #endif 44 44 45 #if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)45 #if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) 46 46 enum { 47 47 CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3 … … 106 106 bool secure = url.protocolIs("https"); 107 107 108 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)108 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) 109 109 return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure)); 110 110 #else … … 117 117 static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url) 118 118 { 119 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)119 #if PLATFORM(IOS) 120 120 CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url); 121 121 #else -
trunk/Source/WebCore/platform/network/mac/CertificateInfoMac.mm
r181455 r190841 34 34 bool CertificateInfo::containsNonRootSHA1SignedCertificate() const 35 35 { 36 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)36 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS) 37 37 if (!m_certificateChain) 38 38 return false; -
trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
r189101 r190841 113 113 #endif 114 114 115 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)115 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 116 116 EXTERN_C CFDataRef _CFNetworkCopyATSContext(void); 117 117 EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef); … … 122 122 #endif 123 123 124 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)124 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 125 125 EXTERN_C CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage); 126 126 EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData); … … 146 146 147 147 // FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon). 148 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)148 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 149 149 @interface NSHTTPCookieStorage () 150 150 + (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage; -
trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h
r190336 r190841 75 75 @end 76 76 77 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 9000078 @protocol AVPlayerViewControllerDelegate <NSObject>79 - (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;80 @end81 #endif82 83 77 @protocol AVPlayerViewControllerDelegate_WebKitOnly <AVPlayerViewControllerDelegate> 84 78 @optional … … 102 96 - (void)stopPictureInPicture; 103 97 104 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000105 @property (nonatomic) BOOL allowsPictureInPicturePlayback;106 @property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;107 #endif108 98 @property (nonatomic, strong) AVPlayerController *playerController; 109 99 @end 110 100 111 101 #endif // USE(APPLE_INTERNAL_SDK) 112 113 #if USE(APPLE_INTERNAL_SDK) && __IPHONE_OS_VERSION_MIN_REQUIRED < 90000114 115 #import <AVKit/AVValueTiming.h>116 117 #else118 102 119 103 @interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying> … … 124 108 @property (NS_NONATOMIC_IOSONLY, readonly) double currentValue; 125 109 @end 126 127 #endif128 110 129 111 #endif // PLATFORM(IOS) -
trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h
r188609 r190841 110 110 #endif 111 111 112 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000112 #if PLATFORM(IOS) 113 113 extern const CFStringRef kCTUIFontTextStyleTitle1; 114 114 extern const CFStringRef kCTUIFontTextStyleTitle2; -
trunk/Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h
r182637 r190841 24 24 */ 25 25 26 #define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)26 #define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS) 27 27 28 28 #if USE(APPLE_INTERNAL_SDK) -
trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
r188610 r190841 132 132 @end 133 133 134 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)134 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 135 135 typedef enum { 136 136 kCATransactionPhasePreLayout, … … 164 164 // FIXME: Move this into the APPLE_INTERNAL_SDK block once it's in an SDK. 165 165 @interface CAContext (AdditionalDetails) 166 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)166 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 167 167 - (void)invalidateFences; 168 168 #endif -
trunk/Source/WebCore/platform/spi/cocoa/SecuritySPI.h
r185951 r190841 42 42 #endif 43 43 44 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)44 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS) 45 45 typedef uint32_t SecSignatureHashAlgorithm; 46 46 enum { -
trunk/Source/WebCore/platform/spi/ios/LaunchServicesSPI.h
r190336 r190841 31 31 #if USE(APPLE_INTERNAL_SDK) 32 32 33 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000034 33 #import <MobileCoreServices/LSAppLinkPriv.h> 35 #endif36 34 37 35 #endif … … 43 41 #if !USE(APPLE_INTERNAL_SDK) 44 42 45 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000046 43 @interface LSResourceProxy : NSObject <NSCopying, NSSecureCoding> 47 44 @end … … 63 60 @property (readonly, strong) LSApplicationProxy *targetApplicationProxy; 64 61 @end 65 #endif66 62 67 63 #endif -
trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h
r185727 r190841 65 65 #endif 66 66 67 #if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK) || __IPHONE_OS_VERSION_MIN_REQUIRED < 9000067 #if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK) 68 68 69 69 @interface AVPlayerLayer (AVPlayerLayerPictureInPictureModeSupportPrivate) -
trunk/Source/WebCore/platform/text/TextBreakIterator.cpp
r190103 r190841 31 31 32 32 // FIXME: This needs a better name 33 #define ADDITIONAL_EMOJI_SUPPORT ( (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))33 #define ADDITIONAL_EMOJI_SUPPORT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)) 34 34 35 35 namespace WebCore { -
trunk/Source/WebCore/platform/text/TextFlags.h
r190192 r190841 30 30 // FIXME: When we have moved entirely to CORETEXT_WEB_FONTS, remove the isCustomFont member variable from Font, since it will no longer be used. 31 31 // See https://bug-145873-attachments.webkit.org/attachment.cgi?id=254710 32 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)32 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000 33 33 #define CORETEXT_WEB_FONTS 0 34 34 #else -
trunk/Source/WebCore/platform/text/ios/LocalizedDateCache.mm
r184555 r190841 156 156 // date doesn't adjust for the current timezone. This is an arbitrary date 157 157 // (x-27-2007) and time (10:45 PM). 158 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000159 158 RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]); 160 #else161 RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]);162 #endif163 159 [gregorian.get() setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]]; 164 160 RetainPtr<NSDateComponents> components = adoptNS([[NSDateComponents alloc] init]); -
trunk/Source/WebCore/platform/text/mac/LocaleMac.mm
r179364 r190841 85 85 LocaleMac::LocaleMac(NSLocale* locale) 86 86 : m_locale(locale) 87 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || PLATFORM(MAC)88 87 , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian])) 89 #else90 , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))91 #endif92 88 , m_didInitializeNumberData(false) 93 89 { -
trunk/Source/WebCore/rendering/RenderThemeIOS.mm
r190192 r190841 1094 1094 static NeverDestroyed<FontCascadeDescription> shortCaption1Font; 1095 1095 static NeverDestroyed<FontCascadeDescription> tallBodyFont; 1096 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 802001097 1096 static NeverDestroyed<FontCascadeDescription> title1Font; 1098 1097 static NeverDestroyed<FontCascadeDescription> title2Font; 1099 1098 static NeverDestroyed<FontCascadeDescription> title3Font; 1100 #endif1101 1099 1102 1100 static CFStringRef userTextSize = contentSizeCategory(); … … 1124 1122 case CSSValueAppleSystemBody: 1125 1123 return bodyFont; 1126 #if __IPHONE_OS_VERSION_MIN_REQUIRED > 802001127 1124 case CSSValueAppleSystemTitle1: 1128 1125 return title1Font; … … 1131 1128 case CSSValueAppleSystemTitle3: 1132 1129 return title3Font; 1133 #endif1134 1130 case CSSValueAppleSystemSubheadline: 1135 1131 return subheadlineFont; … … 1172 1168 fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0)); 1173 1169 break; 1174 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 900001175 1170 case CSSValueAppleSystemTitle1: 1176 1171 textStyle = kCTUIFontTextStyleTitle1; … … 1185 1180 fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0)); 1186 1181 break; 1187 #endif1188 1182 case CSSValueAppleSystemSubheadline: 1189 1183 textStyle = kCTUIFontTextStyleSubhead; -
trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp
r190375 r190841 1107 1107 ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size()); 1108 1108 1109 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)1109 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 1110 1110 // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901> 1111 1111 for (int i = 0; i < 6; ++i) … … 1405 1405 } 1406 1406 1407 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)1407 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000 1408 1408 // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by 1409 1409 // inflating the font's bounding box -
trunk/Source/WebKit/mac/ChangeLog
r190837 r190841 1 2015-10-10 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Remove unnecessary iOS version checks 4 https://bugs.webkit.org/show_bug.cgi?id=150002 5 6 Reviewed by Alexey Proskuryakov. 7 8 * Plugins/WebPluginController.h: 9 * Plugins/WebPluginController.mm: 10 (-[WebPluginController plugInViewWithArguments:fromPluginPackage:]): 11 (+[WebPluginController addPlugInView:]): 12 (+[WebPluginController plugInViewWithArguments:fromPluginPackage:]): Deleted. 13 * WebCoreSupport/WebFrameLoaderClient.mm: 14 (pluginView): 15 * WebView/WebPreferences.mm: 16 (-[WebPreferences isDNSPrefetchingEnabled]): 17 (-[WebPreferences setWebInspectorServerEnabled:]): Deleted. 18 (-[WebPreferences _setAllowCompositingLayerVisualDegradation:]): Deleted. 19 * WebView/WebPreferencesPrivate.h: 20 * WebView/WebView.mm: 21 (shouldAllowPictureInPictureMediaPlayback): 22 1 23 2015-10-10 Dan Bernstein <mitz@apple.com> 2 24 -
trunk/Source/WebKit/mac/Plugins/WebPluginController.h
r168079 r190841 48 48 } 49 49 50 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 8000051 + (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;52 #else53 50 - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin; 54 #endif55 51 + (BOOL)isPlugInView:(NSView *)view; 56 52 -
trunk/Source/WebKit/mac/Plugins/WebPluginController.mm
r185111 r190841 120 120 @implementation WebPluginController 121 121 122 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000123 + (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage124 {125 initializeAudioSession();126 [pluginPackage load];127 Class viewFactory = [pluginPackage viewFactory];128 129 id view = nil;130 131 if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {132 JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());133 view = [viewFactory plugInViewWithArguments:arguments];134 }135 136 return view;137 }138 #else139 122 - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage 140 123 { … … 175 158 return view; 176 159 } 177 #endif178 160 179 161 #if PLATFORM(IOS) -
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
r190611 r190841 1771 1771 } 1772 1772 1773 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 800001774 view = [WebPluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];1775 [attributes release];1776 #else1777 1773 view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage]; 1778 1774 [attributes release]; 1779 #endif1780 1775 1781 1776 return view; -
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
r190578 r190841 1184 1184 @implementation WebPreferences (WebPrivate) 1185 1185 1186 #if PLATFORM(IOS) && !(__IPHONE_OS_VERSION_MIN_REQUIRED >= 60000)1187 - (void) setWebInspectorServerEnabled:(BOOL)flag1188 {1189 }1190 #endif1191 1192 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 800001193 - (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag1194 {1195 }1196 #endif1197 1198 1186 - (BOOL)isDNSPrefetchingEnabled 1199 1187 { -
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
r189129 r190841 456 456 @property (nonatomic) BOOL mediaDataLoadsAutomatically; 457 457 458 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000459 - (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;460 #endif461 462 458 @end -
trunk/Source/WebKit/mac/WebView/WebView.mm
r190156 r190841 852 852 static bool shouldAllowPictureInPictureMediaPlayback() 853 853 { 854 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000854 #if PLATFORM(IOS) 855 855 static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0); 856 856 return shouldAllowPictureInPictureMediaPlayback; -
trunk/Source/WebKit2/ChangeLog
r190837 r190841 1 2015-10-10 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Remove unnecessary iOS version checks 4 https://bugs.webkit.org/show_bug.cgi?id=150002 5 6 Reviewed by Alexey Proskuryakov. 7 8 * NetworkProcess/cocoa/NetworkProcessCocoa.mm: 9 (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa): 10 * Platform/IPC/mac/ConnectionMac.mm: 11 (IPC::AccessibilityProcessSuspendedNotification): 12 * Platform/spi/ios/SafariServicesSPI.h: 13 * Platform/spi/ios/UIKitSPI.h: 14 * Shared/Network/NetworkProcessCreationParameters.cpp: 15 (WebKit::NetworkProcessCreationParameters::encode): 16 (WebKit::NetworkProcessCreationParameters::decode): 17 * Shared/Network/NetworkProcessCreationParameters.h: 18 * Shared/Plugins/PluginProcessCreationParameters.cpp: 19 (WebKit::PluginProcessCreationParameters::encode): 20 (WebKit::PluginProcessCreationParameters::decode): 21 * Shared/Plugins/PluginProcessCreationParameters.h: 22 * Shared/WebEventConversion.cpp: 23 (WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint): 24 * Shared/WebProcessCreationParameters.cpp: 25 (WebKit::WebProcessCreationParameters::encode): 26 (WebKit::WebProcessCreationParameters::decode): 27 * Shared/WebProcessCreationParameters.h: 28 * Shared/ios/NativeWebTouchEventIOS.mm: 29 (WebKit::NativeWebTouchEvent::extractWebTouchPoint): 30 (WebKit::NativeWebTouchEvent::NativeWebTouchEvent): 31 * Shared/ios/WebPlatformTouchPointIOS.cpp: 32 (WebKit::WebPlatformTouchPoint::encode): 33 (WebKit::WebPlatformTouchPoint::decode): 34 * UIProcess/API/Cocoa/WKWebView.mm: 35 (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]): 36 (shouldAllowPictureInPictureMediaPlayback): 37 (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]): 38 * UIProcess/Cocoa/WebProcessPoolCocoa.mm: 39 (WebKit::WebProcessPool::platformInitializeWebProcess): 40 (WebKit::WebProcessPool::platformInitializeNetworkProcess): 41 * UIProcess/Plugins/mac/PluginProcessProxyMac.mm: 42 (WebKit::PluginProcessProxy::platformInitializePluginProcess): 43 * UIProcess/ios/ViewGestureControllerIOS.mm: 44 (-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]): 45 * UIProcess/ios/WKContentViewInteraction.mm: 46 (-[WKContentView setupInteraction]): 47 (-[WKContentView _ensureFormAccessoryView]): 48 (-[WKContentView webSelectionAssistant]): 49 (-[WKContentView selectionInteractionAssistant]): 50 * UIProcess/ios/WebVideoFullscreenManagerProxy.mm: 51 (WebKit::WebVideoFullscreenManagerProxy::create): 52 * UIProcess/ios/forms/WKFileUploadPanel.mm: 53 (photoLibraryIcon): 54 (cameraIcon): 55 (fallbackIconForFile): 56 (iconForImageFile): 57 * WebKit2.xcodeproj/project.pbxproj: 58 * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm: 59 (WebKit::RemoteLayerTreeDrawingArea::flushLayers): 60 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: 61 (WebKit::TiledCoreAnimationDrawingArea::flushLayers): 62 * WebProcess/cocoa/WebProcessCocoa.mm: 63 (WebKit::WebProcess::platformInitializeWebProcess): 64 1 65 2015-10-10 Dan Bernstein <mitz@apple.com> 2 66 -
trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
r189313 r190841 76 76 m_diskCacheDirectory = parameters.diskCacheDirectory; 77 77 78 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)78 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 79 79 _CFNetworkSetATSContext(parameters.networkATSContext.get()); 80 80 #endif -
trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
r187563 r190841 614 614 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000 615 615 _AXUIElementNotifyProcessSuspendStatus(suspended ? AXSuspendStatusSuspended : AXSuspendStatusRunning); 616 #elif PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000616 #elif PLATFORM(IOS) 617 617 UIAccessibilityPostNotification(kAXPidStatusChangedNotification, @{ @"pid" : @(getpid()), @"suspended" : @(suspended) }); 618 618 #else -
trunk/Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h
r190336 r190841 24 24 */ 25 25 26 #if HAVE(SAFARI_SERVICES_FRAMEWORK) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000026 #if HAVE(SAFARI_SERVICES_FRAMEWORK) 27 27 28 28 #import <WebCore/SoftLinking.h> -
trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h
r190336 r190841 596 596 @property (nonatomic, assign, getter=isNextEnabled) BOOL nextEnabled; 597 597 @property (nonatomic, assign, getter=isPreviousEnabled) BOOL previousEnabled; 598 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000599 598 - (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem; 600 #endif601 599 @end 602 600 … … 644 642 unsigned touchPointCount; 645 643 646 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000647 644 bool isPotentialTap; 648 #endif649 645 }; 650 646 -
trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp
r184211 r190841 73 73 encoder << httpProxy; 74 74 encoder << httpsProxy; 75 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)75 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 76 76 IPC::encode(encoder, networkATSContext.get()); 77 77 #endif … … 139 139 if (!decoder.decode(result.httpsProxy)) 140 140 return false; 141 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)141 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 142 142 if (!IPC::decode(decoder, result.networkATSContext)) 143 143 return false; -
trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h
r184211 r190841 85 85 String httpProxy; 86 86 String httpsProxy; 87 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)87 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 88 88 RetainPtr<CFDataRef> networkATSContext; 89 89 #endif -
trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
r182073 r190841 48 48 #if PLATFORM(COCOA) 49 49 encoder << acceleratedCompositingPort; 50 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)50 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 51 51 IPC::encode(encoder, networkATSContext.get()); 52 52 #endif … … 67 67 if (!decoder.decode(result.acceleratedCompositingPort)) 68 68 return false; 69 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)69 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 70 70 if (!IPC::decode(decoder, result.networkATSContext)) 71 71 return false; -
trunk/Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
r182073 r190841 56 56 #if PLATFORM(COCOA) 57 57 WebCore::MachSendRight acceleratedCompositingPort; 58 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)58 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 59 59 RetainPtr<CFDataRef> networkATSContext; 60 60 #endif -
trunk/Source/WebKit2/Shared/WebEventConversion.cpp
r189868 r190841 244 244 WebKit2PlatformTouchPoint(const WebPlatformTouchPoint& webTouchPoint) 245 245 : PlatformTouchPoint(webTouchPoint.identifier(), webTouchPoint.location(), touchEventType(webTouchPoint) 246 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000246 #if ENABLE(IOS_TOUCH_EVENTS) 247 247 , webTouchPoint.force() 248 248 #endif -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
r185317 r190841 153 153 #endif 154 154 155 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)155 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 156 156 IPC::encode(encoder, networkATSContext.get()); 157 157 #endif … … 319 319 #endif 320 320 321 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)321 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 322 322 if (!IPC::decode(decoder, parameters.networkATSContext)) 323 323 return false; -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h
r185317 r190841 174 174 #endif 175 175 176 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)176 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 177 177 RetainPtr<CFDataRef> networkATSContext; 178 178 #endif -
trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm
r189753 r190841 88 88 WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase); 89 89 WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase); 90 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000090 #if ENABLE(IOS_TOUCH_EVENTS) 91 91 platformTouchPoint.setForce(touchPoint.force); 92 92 #endif … … 103 103 extractWebTouchPoint(event), 104 104 positionForCGPoint(event->locationInDocumentCoordinates), 105 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 &&defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP105 #if defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP 106 106 event->isPotentialTap, 107 107 #else -
trunk/Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp
r189753 r190841 41 41 encoder << m_location; 42 42 encoder << m_phase; 43 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000043 #if ENABLE(IOS_TOUCH_EVENTS) 44 44 encoder << m_force; 45 45 #endif … … 54 54 if (!decoder.decode(result.m_phase)) 55 55 return false; 56 #if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000056 #if ENABLE(IOS_TOUCH_EVENTS) 57 57 if (!decoder.decode(result.m_force)) 58 58 return false; -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r190823 r190841 256 256 - (BOOL)_mayAutomaticallyShowVideoPictureInPicture 257 257 { 258 #if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 80200) ||!HAVE(AVKIT)258 #if !HAVE(AVKIT) 259 259 return false; 260 260 #else … … 268 268 static bool shouldAllowPictureInPictureMediaPlayback() 269 269 { 270 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000271 270 static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0); 272 271 return shouldAllowPictureInPictureMediaPlayback; 273 #else274 return false;275 #endif276 272 } 277 273 … … 2938 2934 #if USE(IOSURFACE) 2939 2935 // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly. 2940 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 900002941 2936 if (CADisplay *display = self.window.screen._display) { 2942 #else2943 if (self.window) {2944 #endif2945 2937 auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB); 2946 2938 CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width; 2947 2939 CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1); 2948 2940 transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0); 2949 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 900002950 2941 CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(MACH_PORT_NULL, (CFStringRef)display.name, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform, 0); 2951 #else2952 CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform);2953 #endif2954 2942 completionHandler(surface->createImage().get()); 2955 2943 return; -
trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
r188627 r190841 221 221 }, data.leakRef()); 222 222 } 223 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)223 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 224 224 parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext()); 225 225 #endif … … 249 249 parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey]; 250 250 parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey]; 251 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)251 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 252 252 parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext()); 253 253 #endif -
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
r186125 r190841 170 170 parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort); 171 171 #endif 172 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)172 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 173 173 parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext()); 174 174 #endif -
trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm
r188521 r190841 117 117 UIScreenEdgePanGestureRecognizer *recognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:target action:action]; 118 118 119 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000120 119 bool isLTR = [UIView userInterfaceLayoutDirectionForSemanticContentAttribute:[_gestureRecognizerView.get() semanticContentAttribute]] == UIUserInterfaceLayoutDirectionLeftToRight; 121 #else122 bool isLTR = true;123 #endif124 120 125 121 switch ([self directionForTransition:transition]) { -
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
r190568 r190841 216 216 @end 217 217 218 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000219 218 @protocol UISelectionInteractionAssistant; 220 219 #if HAVE(LINK_PREVIEW) … … 224 223 #endif 225 224 226 #endif227 228 225 @interface WKFormInputSession : NSObject <_WKFormInputSession> 229 226 … … 343 340 [_longPressGestureRecognizer setDelay:tapAndHoldDelay]; 344 341 [_longPressGestureRecognizer setDelegate:self]; 345 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000346 342 [_longPressGestureRecognizer _setRequiresQuietImpulse:YES]; 347 #endif348 343 [self addGestureRecognizer:_longPressGestureRecognizer.get()]; 349 344 … … 1272 1267 return; 1273 1268 1274 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 900001275 1269 _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:self.inputAssistantItem]); 1276 #else1277 _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);1278 #endif1279 1270 [_formAccessoryView setDelegate:self]; 1280 1271 } … … 2564 2555 } 2565 2556 2566 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 900002567 2557 - (id<UISelectionInteractionAssistant>)selectionInteractionAssistant 2568 2558 { … … 2571 2561 return nil; 2572 2562 } 2573 #endif2574 2563 2575 2564 // NSRange support. Would like to deprecate to the extent possible, although some support -
trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm
r187491 r190841 68 68 namespace WebKit { 69 69 70 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 ||!HAVE(AVKIT)70 #if !HAVE(AVKIT) 71 71 72 72 RefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&) -
trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm
r186678 r190841 72 72 { 73 73 // FIXME: Remove when a new SDK is available. <rdar://problem/20150072> 74 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 &&defined(HAVE_WEBKIT_DOC_PICKER_ICONS)74 #if defined(HAVE_WEBKIT_DOC_PICKER_ICONS) 75 75 return _UIImageGetWebKitPhotoLibraryIcon(); 76 76 #else … … 82 82 { 83 83 // FIXME: Remove when a new SDK is available. <rdar://problem/20150072> 84 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 &&defined(HAVE_WEBKIT_DOC_PICKER_ICONS)84 #if defined(HAVE_WEBKIT_DOC_PICKER_ICONS) 85 85 return _UIImageGetWebKitTakePhotoOrVideoIcon(); 86 86 #else … … 140 140 141 141 UIDocumentInteractionController *interactionController = [UIDocumentInteractionController interactionControllerWithURL:file]; 142 #if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000143 return thumbnailSizedImageForImage(((UIImage *)interactionController.icons[0]).CGImage);144 #else145 142 return thumbnailSizedImageForImage(interactionController.icons[0].CGImage); 146 #endif147 143 } 148 144 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
r190064 r190841 358 358 visibleRect.intersect(m_scrolledExposedRect); 359 359 360 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)360 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 361 361 RefPtr<WebPage> retainedPage = &m_webPage; 362 362 [CATransaction addCommitHandler:[retainedPage] { -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
r189105 r190841 420 420 m_viewOverlayRootLayer->flushCompositingState(visibleRect, m_webPage.mainFrameView()->viewportIsStable()); 421 421 422 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)422 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 423 423 RefPtr<WebPage> retainedPage = &m_webPage; 424 424 [CATransaction addCommitHandler:[retainedPage] { -
trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
r190336 r190841 168 168 method_setImplementation(methodToPatch, (IMP)NSApplicationAccessibilityFocusedUIElement); 169 169 #endif 170 #if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)|| (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)170 #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) 171 171 _CFNetworkSetATSContext(parameters.networkATSContext.get()); 172 172 #endif 173 173 174 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000174 #if TARGET_OS_IPHONE 175 175 // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112). 176 176 pthread_set_fixedpriority_self(); -
trunk/Tools/ChangeLog
r190836 r190841 1 2015-10-10 Dan Bernstein <mitz@apple.com> 2 3 [iOS] Remove unnecessary iOS version checks 4 https://bugs.webkit.org/show_bug.cgi?id=150002 5 6 Reviewed by Alexey Proskuryakov. 7 8 * WebKitTestRunner/ios/HIDEventGenerator.mm: 9 (-[HIDEventGenerator _createIOHIDEventType:]): 10 (-[HIDEventGenerator _sendHIDEvent:]): 11 (-[HIDEventGenerator _sendMarkerHIDEventWithCompletionBlock:]): 12 * WebKitTestRunner/ios/UIKitSPI.h: 13 1 14 2015-10-09 Myles C. Maxfield <mmaxfield@apple.com> 2 15 -
trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm
r190652 r190841 206 206 } 207 207 208 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000209 208 if (_activePointCount) { 210 209 IOHIDFloat progress = _activePoints[0].pathPressure; … … 218 217 IOHIDEventAppendEvent(eventRef.get(), forceEvent.get(), 0); 219 218 } 220 #endif221 219 222 220 return eventRef.leakRef(); … … 234 232 ASSERT(contextID); 235 233 BKSHIDEventSetDigitizerInfo(strongEvent.get(), contextID, false, false, NULL, 0, 0); 236 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000237 234 [[UIApplication sharedApplication] _enqueueHIDEvent:strongEvent.get()]; 238 #endif239 235 }); 240 236 } … … 264 260 ASSERT(contextID); 265 261 BKSHIDEventSetDigitizerInfo(markerEvent.get(), contextID, false, false, NULL, 0, 0); 266 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000267 262 [[UIApplication sharedApplication] _enqueueHIDEvent:markerEvent.get()]; 268 #endif269 263 }); 270 264 } -
trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h
r190565 r190841 43 43 44 44 @interface UIApplication () 45 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 9000046 45 - (void)_enqueueHIDEvent:(IOHIDEventRef)event; 47 #endif48 46 - (void)_handleHIDEvent:(IOHIDEventRef)event; 49 47 @end
Note: See TracChangeset
for help on using the changeset viewer.