[iOS] Remove unnecessary iOS version checks
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Oct 2015 20:05:53 +0000 (20:05 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 10 Oct 2015 20:05:53 +0000 (20:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150002

Reviewed by Alexey Proskuryakov.

Source/JavaScriptCore:

* llvm/library/LLVMExports.cpp:
(initializeAndGetJSCLLVMAPI):

Source/WebCore:

* loader/cache/CachedFont.cpp:
(WebCore::CachedFont::ensureCustomFontData):
* loader/cocoa/DiskCacheMonitorCocoa.h:
(WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation):
* page/mac/SettingsMac.mm:
(WebCore::sansSerifTraditionalHanFontFamily):
(WebCore::sansSerifSimplifiedHanFontFamily):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::appendOpenTypeFeature):
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::getSystemFontFallbackForCharacters):
(WebCore::platformLookupFallbackFont):
* platform/ios/PlatformSpeechSynthesizerIOS.mm:
(WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
* platform/ios/WebCoreSystemInterfaceIOS.h:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
* platform/ios/wak/WAKWindow.mm:
(+[WAKWindow hasLandscapeOrientation]):
(-[WAKWindow hostLayer]):
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::copyCookiesForURLWithFirstPartyURL):
(WebCore::createCookies):
* platform/network/mac/CertificateInfoMac.mm:
(WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
* platform/spi/cf/CFNetworkSPI.h:
* platform/spi/cocoa/AVKitSPI.h:
* platform/spi/cocoa/CoreTextSPI.h:
* platform/spi/cocoa/NEFilterSourceSPI.h:
* platform/spi/cocoa/QuartzCoreSPI.h:
* platform/spi/cocoa/SecuritySPI.h:
* platform/spi/ios/LaunchServicesSPI.h:
* platform/spi/mac/AVFoundationSPI.h:
* platform/text/TextBreakIterator.cpp:
* platform/text/TextFlags.h:
* platform/text/ios/LocalizedDateCache.mm:
(WebCore::LocalizedDateCache::calculateMaximumWidth):
* platform/text/mac/LocaleMac.mm:
(WebCore::LocaleMac::LocaleMac):
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::cachedSystemFontDescription):
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendKERNTable):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):

Source/WebKit/mac:

* Plugins/WebPluginController.h:
* Plugins/WebPluginController.mm:
(-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
(+[WebPluginController addPlugInView:]):
(+[WebPluginController plugInViewWithArguments:fromPluginPackage:]): Deleted.
* WebCoreSupport/WebFrameLoaderClient.mm:
(pluginView):
* WebView/WebPreferences.mm:
(-[WebPreferences isDNSPrefetchingEnabled]):
(-[WebPreferences setWebInspectorServerEnabled:]): Deleted.
(-[WebPreferences _setAllowCompositingLayerVisualDegradation:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(shouldAllowPictureInPictureMediaPlayback):

Source/WebKit2:

* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::AccessibilityProcessSuspendedNotification):
* Platform/spi/ios/SafariServicesSPI.h:
* Platform/spi/ios/UIKitSPI.h:
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* Shared/Plugins/PluginProcessCreationParameters.cpp:
(WebKit::PluginProcessCreationParameters::encode):
(WebKit::PluginProcessCreationParameters::decode):
* Shared/Plugins/PluginProcessCreationParameters.h:
* Shared/WebEventConversion.cpp:
(WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* Shared/ios/NativeWebTouchEventIOS.mm:
(WebKit::NativeWebTouchEvent::extractWebTouchPoint):
(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
* Shared/ios/WebPlatformTouchPointIOS.cpp:
(WebKit::WebPlatformTouchPoint::encode):
(WebKit::WebPlatformTouchPoint::decode):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
(shouldAllowPictureInPictureMediaPlayback):
(-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformInitializePluginProcess):
* UIProcess/ios/ViewGestureControllerIOS.mm:
(-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView _ensureFormAccessoryView]):
(-[WKContentView webSelectionAssistant]):
(-[WKContentView selectionInteractionAssistant]):
* UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
(WebKit::WebVideoFullscreenManagerProxy::create):
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(photoLibraryIcon):
(cameraIcon):
(fallbackIconForFile):
(iconForImageFile):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::flushLayers):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::flushLayers):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):

Source/WTF:

* wtf/Platform.h:

Tools:

* WebKitTestRunner/ios/HIDEventGenerator.mm:
(-[HIDEventGenerator _createIOHIDEventType:]):
(-[HIDEventGenerator _sendHIDEvent:]):
(-[HIDEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):
* WebKitTestRunner/ios/UIKitSPI.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@190841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

66 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/llvm/library/LLVMExports.cpp
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WebCore/ChangeLog
Source/WebCore/loader/cache/CachedFont.cpp
Source/WebCore/loader/cocoa/DiskCacheMonitorCocoa.h
Source/WebCore/page/mac/SettingsMac.mm
Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
Source/WebCore/platform/ios/PlatformSpeechSynthesizerIOS.mm
Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h
Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm
Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
Source/WebCore/platform/ios/wak/WAKWindow.mm
Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
Source/WebCore/platform/network/mac/CertificateInfoMac.mm
Source/WebCore/platform/spi/cf/CFNetworkSPI.h
Source/WebCore/platform/spi/cocoa/AVKitSPI.h
Source/WebCore/platform/spi/cocoa/CoreTextSPI.h
Source/WebCore/platform/spi/cocoa/NEFilterSourceSPI.h
Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
Source/WebCore/platform/spi/cocoa/SecuritySPI.h
Source/WebCore/platform/spi/ios/LaunchServicesSPI.h
Source/WebCore/platform/spi/mac/AVFoundationSPI.h
Source/WebCore/platform/text/TextBreakIterator.cpp
Source/WebCore/platform/text/TextFlags.h
Source/WebCore/platform/text/ios/LocalizedDateCache.mm
Source/WebCore/platform/text/mac/LocaleMac.mm
Source/WebCore/rendering/RenderThemeIOS.mm
Source/WebCore/svg/SVGToOTFFontConversion.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/WebPluginController.h
Source/WebKit/mac/Plugins/WebPluginController.mm
Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
Source/WebKit2/Platform/spi/ios/SafariServicesSPI.h
Source/WebKit2/Platform/spi/ios/UIKitSPI.h
Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp
Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h
Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.cpp
Source/WebKit2/Shared/Plugins/PluginProcessCreationParameters.h
Source/WebKit2/Shared/WebEventConversion.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.h
Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm
Source/WebKit2/Shared/ios/WebPlatformTouchPointIOS.cpp
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm
Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm
Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm
Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
Tools/ChangeLog
Tools/WebKitTestRunner/ios/HIDEventGenerator.mm
Tools/WebKitTestRunner/ios/UIKitSPI.h

index aa696c4..726e571 100644 (file)
@@ -1,5 +1,15 @@
 2015-10-10  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove unnecessary iOS version checks
+        https://bugs.webkit.org/show_bug.cgi?id=150002
+
+        Reviewed by Alexey Proskuryakov.
+
+        * llvm/library/LLVMExports.cpp:
+        (initializeAndGetJSCLLVMAPI):
+
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
         [iOS] Remove project support for iOS 8
         https://bugs.webkit.org/show_bug.cgi?id=149993
 
index fc55b7b..5c881b3 100644 (file)
@@ -93,7 +93,7 @@ extern "C" JSC::LLVMAPI* initializeAndGetJSCLLVMAPI(
     LLVMInitializeX86AsmPrinter();
     LLVMInitializeX86Disassembler();
 #elif CPU(ARM64)
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED > 80200) || OS(LINUX)
+#if PLATFORM(IOS) || OS(LINUX)
     LLVMInitializeAArch64TargetInfo();
     LLVMInitializeAArch64Target();
     LLVMInitializeAArch64TargetMC();
index 49b962b..ef61275 100644 (file)
@@ -1,5 +1,14 @@
 2015-10-10  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove unnecessary iOS version checks
+        https://bugs.webkit.org/show_bug.cgi?id=150002
+
+        Reviewed by Alexey Proskuryakov.
+
+        * wtf/Platform.h:
+
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
         [iOS] Remove project support for iOS 8
         https://bugs.webkit.org/show_bug.cgi?id=149993
 
index 5f6aa24..773a263 100644 (file)
 #define USE_QUICK_LOOK 1
 #endif
 
-#if defined(TARGET_OS_IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if TARGET_OS_IOS
 #define HAVE_APP_LINKS 1
 #endif
 
 #endif
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
+#if PLATFORM(IOS) || PLATFORM(MAC)
 #define USE_COREMEDIA 1
 #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if PLATFORM(IOS) || (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG)) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
 #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 70000) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
+#if PLATFORM(IOS) || ((PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
 #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
 #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
 #endif
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
+#if PLATFORM(IOS) || PLATFORM(MAC)
 #define HAVE_AVFOUNDATION_LOADER_DELEGATE 1
 #endif
 
 #define USE_INSERTION_UNDO_GROUPING 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
 #define HAVE_TIMINGDATAOPTIONS 1
 #endif
 
 #define USE_MEDIATOOLBOX 1
 #endif
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if PLATFORM(IOS)
 #define ENABLE_VIDEO_PRESENTATION_MODE 1
 #endif
 
index f791444..dcf08a9 100644 (file)
@@ -1,3 +1,57 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove unnecessary iOS version checks
+        https://bugs.webkit.org/show_bug.cgi?id=150002
+
+        Reviewed by Alexey Proskuryakov.
+
+        * loader/cache/CachedFont.cpp:
+        (WebCore::CachedFont::ensureCustomFontData):
+        * loader/cocoa/DiskCacheMonitorCocoa.h:
+        (WebCore::DiskCacheMonitor::monitorFileBackingStoreCreation):
+        * page/mac/SettingsMac.mm:
+        (WebCore::sansSerifTraditionalHanFontFamily):
+        (WebCore::sansSerifSimplifiedHanFontFamily):
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::appendOpenTypeFeature):
+        * platform/graphics/ios/FontCacheIOS.mm:
+        (WebCore::getSystemFontFallbackForCharacters):
+        (WebCore::platformLookupFallbackFont):
+        * platform/ios/PlatformSpeechSynthesizerIOS.mm:
+        (WebCore::PlatformSpeechSynthesizer::initializeVoiceList):
+        * platform/ios/WebCoreSystemInterfaceIOS.h:
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        * platform/ios/wak/WAKWindow.mm:
+        (+[WAKWindow hasLandscapeOrientation]):
+        (-[WAKWindow hostLayer]):
+        * platform/network/cf/CookieJarCFNet.cpp:
+        (WebCore::copyCookiesForURLWithFirstPartyURL):
+        (WebCore::createCookies):
+        * platform/network/mac/CertificateInfoMac.mm:
+        (WebCore::CertificateInfo::containsNonRootSHA1SignedCertificate):
+        * platform/spi/cf/CFNetworkSPI.h:
+        * platform/spi/cocoa/AVKitSPI.h:
+        * platform/spi/cocoa/CoreTextSPI.h:
+        * platform/spi/cocoa/NEFilterSourceSPI.h:
+        * platform/spi/cocoa/QuartzCoreSPI.h:
+        * platform/spi/cocoa/SecuritySPI.h:
+        * platform/spi/ios/LaunchServicesSPI.h:
+        * platform/spi/mac/AVFoundationSPI.h:
+        * platform/text/TextBreakIterator.cpp:
+        * platform/text/TextFlags.h:
+        * platform/text/ios/LocalizedDateCache.mm:
+        (WebCore::LocalizedDateCache::calculateMaximumWidth):
+        * platform/text/mac/LocaleMac.mm:
+        (WebCore::LocaleMac::LocaleMac):
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::cachedSystemFontDescription):
+        (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+        * svg/SVGToOTFFontConversion.cpp:
+        (WebCore::SVGToOTFFontConverter::appendKERNTable):
+        (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+
 2015-10-10  Antti Koivisto  <antti@apple.com>
 
         Rewrite HTMLDetailsElement using HTMLSlotElement
index 1604e39..101cc45 100644 (file)
@@ -102,7 +102,7 @@ bool CachedFont::ensureCustomFontData(SharedBuffer* data)
     if (!m_fontCustomPlatformData && !errorOccurred() && !isLoading() && data) {
         RefPtr<SharedBuffer> buffer(data);
 
-#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && (!PLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
+#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) && !PLATFORM(IOS)
         if (isWOFF(buffer.get())) {
             Vector<char> convertedFont;
             if (!convertWOFFToSfnt(buffer.get(), convertedFont))
index a3539b8..ab9a0fd 100644 (file)
@@ -55,7 +55,7 @@ private:
     SessionID m_sessionID;
 };
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
 
 inline void DiskCacheMonitor::monitorFileBackingStoreCreation(const ResourceRequest&, SessionID, CFCachedURLResponseRef)
 {
index 3e3f2c5..ae06132 100644 (file)
@@ -30,7 +30,7 @@ namespace WebCore {
 
 static inline const char* sansSerifTraditionalHanFontFamily()
 {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
     return "PingFang TC";
 #else
     return "Heiti TC";
@@ -39,7 +39,7 @@ static inline const char* sansSerifTraditionalHanFontFamily()
 
 static inline const char* sansSerifSimplifiedHanFontFamily()
 {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
     return "PingFang SC";
 #else
     return "Heiti SC";
index b76d8dd..9c6db2b 100644 (file)
@@ -133,7 +133,7 @@ static inline void appendTrueTypeFeature(CFMutableArrayRef features, const FontF
 
 static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
 {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || PLATFORM(IOS)
     RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontFeatureTag::value_type), kCFStringEncodingASCII, false));
     int rawFeatureValue = feature.value();
     RetainPtr<CFNumberRef> featureValue = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawFeatureValue));
index 6705ae9..fd4e100 100644 (file)
@@ -82,12 +82,8 @@ static RetainPtr<CTFontRef> getSystemFontFallbackForCharacters(CTFontRef font, c
 {
     // FIXME: Unify this with platformLookupFallbackFont()
     RetainPtr<CFStringRef> localeString;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 90000
     if (!locale.isNull())
         localeString = locale.string().createCFString();
-#else
-    UNUSED_PARAM(locale);
-#endif
 
     CFIndex coveredLength = 0;
     return adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, (const UTF16Char*)characters, (CFIndex)length, localeString.get(), &coveredLength));
@@ -99,17 +95,12 @@ RetainPtr<CTFontRef> platformLookupFallbackFont(CTFontRef font, FontWeight fontW
     if (length && CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(font)).get()))
         return getSystemFontFallbackForCharacters(font, locale, characters, length);
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     RetainPtr<CFStringRef> localeString;
 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     if (!locale.isNull())
         localeString = locale.string().createCFString();
 #endif
     RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCreatePhysicalFontDescriptorForCharactersWithLanguage(font, characters, length, localeString.get(), nullptr));
-#else
-    RetainPtr<CTFontRef> fallbackFont = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, nullptr, nullptr));
-    RetainPtr<CTFontDescriptorRef> fallbackFontDescriptor = adoptCF(CTFontCopyFontDescriptor(fallbackFont.get()));
-#endif
     UChar32 c = *characters;
     if (length > 1 && U16_IS_LEAD(c) && U16_IS_TRAIL(characters[1]))
         c = U16_GET_SUPPLEMENTARY(c, characters[1]);
index dc0caa8..cf84994 100644 (file)
@@ -249,13 +249,8 @@ void PlatformSpeechSynthesizer::initializeVoiceList()
     for (AVSpeechSynthesisVoice *voice in [AVSpeechSynthesisVoiceClass speechVoices]) {
         NSString *language = [voice language];
         bool isDefault = true;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
         NSString *voiceURI = [voice identifier];
         NSString *name = [voice name];
-#else
-        NSString *voiceURI = language;
-        NSString *name = language;
-#endif
         m_voiceList.append(PlatformSpeechSynthesisVoice::create(voiceURI, name, language, true, isDefault));
     }
     END_BLOCK_OBJC_EXCEPTIONS
index 0dad0bf..98f011a 100644 (file)
@@ -33,9 +33,7 @@ typedef enum {
     wkIOSSystemVersion_4_2 = __IPHONE_4_2,
     wkIOSSystemVersion_5_0 = __IPHONE_5_0,
     wkIOSSystemVersion_6_0 = __IPHONE_6_0,
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     wkIOSSystemVersion_9_0 = __IPHONE_9_0,
-#endif
 } wkIOSSystemVersion;
 
 bool iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion);
index 8f0be5e..f6ec909 100644 (file)
@@ -46,7 +46,7 @@ SOFT_LINK_CLASS(UIKit, UIView)
 
 using namespace WebCore;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED <= 80200 || !HAVE(AVKIT)
+#if !HAVE(AVKIT)
 
 @implementation WebVideoFullscreenController
 - (void)setVideoElement:(WebCore::HTMLVideoElement*)videoElement
@@ -638,6 +638,6 @@ void WebVideoFullscreenControllerContext::requestHideAndExitFullscreen()
 
 @end
 
-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
+#endif // !HAVE(AVKIT)
 
 #endif // PLATFORM(IOS)
index a0af57a..8d2d8c8 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef WebVideoFullscreenInterfaceAVKit_h
 #define WebVideoFullscreenInterfaceAVKit_h
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
+#if PLATFORM(IOS)
 
 #include <WebCore/EventListener.h>
 #include <WebCore/HTMLMediaElementEnums.h>
index ef7ff02..826af13 100644 (file)
@@ -26,7 +26,7 @@
 
 #import "config.h"
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 80200 && HAVE(AVKIT)
+#if PLATFORM(IOS) && HAVE(AVKIT)
 
 #import "WebVideoFullscreenInterfaceAVKit.h"
 
index e80ecfd..bc3fda4 100644 (file)
@@ -44,11 +44,7 @@ WEBCORE_EXPORT NSString * const WAKWindowVisibilityDidChangeNotification = @"WAK
 using namespace WebCore;
 
 @protocol OrientationProvider
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
 - (BOOL)hasLandscapeOrientation;
-#else
-- (int)orientation;
-#endif
 @end
 
 static WAKWindow *_WAKKeyWindow = nil;        // weak
@@ -621,12 +617,7 @@ static id<OrientationProvider> gOrientationProvider;
 + (BOOL)hasLandscapeOrientation
 {
     // this should be perfectly thread safe
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
     return [gOrientationProvider hasLandscapeOrientation];
-#else
-    int orientation = [gOrientationProvider orientation];
-    return orientation == 90 || orientation == -90;
-#endif
 }
 
 - (CALayer*)hostLayer
index 404a44a..947fb3b 100644 (file)
@@ -42,7 +42,7 @@
 #include <windows.h>
 #endif
 
-#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000)
+#if PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090)
 enum {
     CFHTTPCookieStorageAcceptPolicyExclusivelyFromMainDocumentDomain = 3
 };
@@ -105,7 +105,7 @@ static RetainPtr<CFArrayRef> copyCookiesForURLWithFirstPartyURL(const NetworkSto
 {
     bool secure = url.protocolIs("https");
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
     return adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(session.cookieStorage().get(), url.createCFURL().get(), firstParty.createCFURL().get(), secure));
 #else
     // _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL is not available on other platforms.
@@ -116,7 +116,7 @@ static RetainPtr<CFArrayRef> copyCookiesForURLWithFirstPartyURL(const NetworkSto
 
 static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
 {
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+#if PLATFORM(IOS)
     CFArrayRef parsedCookies = _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
 #else
     CFArrayRef parsedCookies = CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
index afee6dd..c0cfa1a 100644 (file)
@@ -33,7 +33,7 @@ namespace WebCore {
 
 bool CertificateInfo::containsNonRootSHA1SignedCertificate() const
 {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
     if (!m_certificateChain)
         return false;
 
index aed24ca..d585225 100644 (file)
@@ -112,7 +112,7 @@ enum : NSUInteger {
 @end
 #endif
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 EXTERN_C CFDataRef _CFNetworkCopyATSContext(void);
 EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
 #endif
@@ -121,7 +121,7 @@ EXTERN_C Boolean _CFNetworkSetATSContext(CFDataRef);
 EXTERN_C void _CFNetworkResetHSTSHostsSinceDate(CFURLStorageSessionRef, CFDateRef);
 #endif
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 EXTERN_C CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
 EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
 EXTERN_C CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
@@ -145,7 +145,7 @@ EXTERN_C CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef
 #endif
 
 // FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 @interface NSHTTPCookieStorage ()
 + (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
 @end
index 71ad434..21f5f0b 100644 (file)
@@ -74,12 +74,6 @@ typedef NS_ENUM(NSInteger, AVPlayerControllerExternalPlaybackType) {
 - (void)stopRoutingVideoToPictureInPicturePlayerLayerView;
 @end
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-@protocol AVPlayerViewControllerDelegate <NSObject>
-- (void)playerViewController:(AVPlayerViewController *)playerViewController restoreUserInterfaceForPictureInPictureStopWithCompletionHandler:(void (^)(BOOL restored))completionHandler;
-@end
-#endif
-
 @protocol AVPlayerViewControllerDelegate_WebKitOnly <AVPlayerViewControllerDelegate>
 @optional
 typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
@@ -101,21 +95,11 @@ typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
 - (void)startPictureInPicture;
 - (void)stopPictureInPicture;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-@property (nonatomic) BOOL allowsPictureInPicturePlayback;
-@property (nonatomic, weak) id <AVPlayerViewControllerDelegate> delegate;
-#endif
 @property (nonatomic, strong) AVPlayerController *playerController;
 @end
 
 #endif // USE(APPLE_INTERNAL_SDK)
 
-#if USE(APPLE_INTERNAL_SDK) && __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-
-#import <AVKit/AVValueTiming.h>
-
-#else
-
 @interface AVValueTiming : NSObject <NSCoding, NSCopying, NSMutableCopying>
 @end
 
@@ -124,8 +108,6 @@ typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
 @property (NS_NONATOMIC_IOSONLY, readonly) double currentValue;
 @end
 
-#endif
-
 #endif // PLATFORM(IOS)
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
index 23a2593..c85e3d5 100644 (file)
@@ -109,7 +109,7 @@ extern const CFStringRef kCTUIFontTextStyleCaption2;
 extern const CFStringRef kCTFontDescriptorTextStyleEmphasized;
 #endif
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if PLATFORM(IOS)
 extern const CFStringRef kCTUIFontTextStyleTitle1;
 extern const CFStringRef kCTUIFontTextStyleTitle2;
 extern const CFStringRef kCTUIFontTextStyleTitle3;
index a289bb8..3306bcd 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+#define HAVE_MODERN_NE_FILTER_SOURCE (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
 
 #if USE(APPLE_INTERNAL_SDK)
 
index 3f376be..ca1df68 100644 (file)
@@ -131,7 +131,7 @@ typedef struct CAColorMatrix CAColorMatrix;
 @property (copy) NSString *name;
 @end
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 typedef enum {
     kCATransactionPhasePreLayout,
     kCATransactionPhasePreCommit,
@@ -163,7 +163,7 @@ EXTERN_C void CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(mach_po
 
 // FIXME: Move this into the APPLE_INTERNAL_SDK block once it's in an SDK.
 @interface CAContext (AdditionalDetails)
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
 - (void)invalidateFences;
 #endif
 @end
index 440af7b..fe4151b 100644 (file)
@@ -41,7 +41,7 @@ EXTERN_C SecTaskRef SecTaskCreateFromSelf(CFAllocatorRef);
 EXTERN_C CFTypeRef SecTaskCopyValueForEntitlement(SecTaskRef, CFStringRef entitlement, CFErrorRef *);
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) || PLATFORM(IOS)
 typedef uint32_t SecSignatureHashAlgorithm;
 enum {
     kSecSignatureHashAlgorithmUnknown = 0,
index cc02466..0e3c9a1 100644 (file)
@@ -30,9 +30,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
 #import <MobileCoreServices/LSAppLinkPriv.h>
-#endif
 
 #endif
 
@@ -42,7 +40,6 @@ typedef void (^LSAppLinkOpenCompletionHandler)(BOOL success, NSError *error);
 
 #if !USE(APPLE_INTERNAL_SDK)
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
 @interface LSResourceProxy : NSObject <NSCopying, NSSecureCoding>
 @end
 
@@ -62,7 +59,6 @@ typedef void (^LSAppLinkOpenCompletionHandler)(BOOL success, NSError *error);
 - (void)openInWebBrowser:(BOOL)inWebBrowser setAppropriateOpenStrategyAndWebBrowserState:(NSDictionary<NSString *, id> *)state completionHandler:(LSAppLinkOpenCompletionHandler)completionHandler;
 @property (readonly, strong) LSApplicationProxy *targetApplicationProxy;
 @end
-#endif
 
 #endif
 
index 3668468..7f68ceb 100644 (file)
@@ -64,7 +64,7 @@
 
 #endif
 
-#if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK) || __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
+#if !HAVE(AVKIT) || !USE(APPLE_INTERNAL_SDK)
 
 @interface AVPlayerLayer (AVPlayerLayerPictureInPictureModeSupportPrivate)
 - (void)setPIPModeEnabled:(BOOL)flag;
index 033ecd5..09fcbfb 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/text/StringView.h>
 
 // FIXME: This needs a better name
-#define ADDITIONAL_EMOJI_SUPPORT ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
+#define ADDITIONAL_EMOJI_SUPPORT (PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100))
 
 namespace WebCore {
 
index 87e1c4e..a0910f6 100644 (file)
@@ -29,7 +29,7 @@
 // <rdar://problem/16980736>: Web fonts crash on certain OSes when using CTFontManagerCreateFontDescriptorFromData()
 // FIXME: When we have moved entirely to CORETEXT_WEB_FONTS, remove the isCustomFont member variable from Font, since it will no longer be used.
 // See https://bug-145873-attachments.webkit.org/attachment.cgi?id=254710
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000
 #define CORETEXT_WEB_FONTS 0
 #else
 #define CORETEXT_WEB_FONTS 1
index 87f74e0..aba58c1 100644 (file)
@@ -155,11 +155,7 @@ float LocalizedDateCache::calculateMaximumWidth(DateComponents::Type type, const
     // typically all equally wide. Force UTC timezone for the test date below so the
     // date doesn't adjust for the current timezone. This is an arbitrary date
     // (x-27-2007) and time (10:45 PM).
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
     RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]);
-#else
-    RetainPtr<NSCalendar> gregorian = adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]);
-#endif
     [gregorian.get() setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]];
     RetainPtr<NSDateComponents> components = adoptNS([[NSDateComponents alloc] init]);
     [components.get() setDay:27];
index 72fe4cf..4c9161c 100644 (file)
@@ -84,11 +84,7 @@ static RetainPtr<NSDateFormatter> createDateTimeFormatter(NSLocale* locale, NSCa
 
 LocaleMac::LocaleMac(NSLocale* locale)
     : m_locale(locale)
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || PLATFORM(MAC)
     , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]))
-#else
-    , m_gregorianCalendar(adoptNS([[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]))
-#endif
     , m_didInitializeNumberData(false)
 {
     NSArray* availableLanguages = [NSLocale ISOLanguageCodes];
index 666f259..99679c8 100644 (file)
@@ -1093,11 +1093,9 @@ FontCascadeDescription& RenderThemeIOS::cachedSystemFontDescription(CSSValueID v
     static NeverDestroyed<FontCascadeDescription> shortFootnoteFont;
     static NeverDestroyed<FontCascadeDescription> shortCaption1Font;
     static NeverDestroyed<FontCascadeDescription> tallBodyFont;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
     static NeverDestroyed<FontCascadeDescription> title1Font;
     static NeverDestroyed<FontCascadeDescription> title2Font;
     static NeverDestroyed<FontCascadeDescription> title3Font;
-#endif
 
     static CFStringRef userTextSize = contentSizeCategory();
 
@@ -1123,14 +1121,12 @@ FontCascadeDescription& RenderThemeIOS::cachedSystemFontDescription(CSSValueID v
         return headlineFont;
     case CSSValueAppleSystemBody:
         return bodyFont;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED > 80200
     case CSSValueAppleSystemTitle1:
         return title1Font;
     case CSSValueAppleSystemTitle2:
         return title2Font;
     case CSSValueAppleSystemTitle3:
         return title3Font;
-#endif
     case CSSValueAppleSystemSubheadline:
         return subheadlineFont;
     case CSSValueAppleSystemFootnote:
@@ -1171,7 +1167,6 @@ void RenderThemeIOS::updateCachedSystemFontDescription(CSSValueID valueID, FontC
         textStyle = kCTUIFontTextStyleBody;
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
         break;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     case CSSValueAppleSystemTitle1:
         textStyle = kCTUIFontTextStyleTitle1;
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
@@ -1184,7 +1179,6 @@ void RenderThemeIOS::updateCachedSystemFontDescription(CSSValueID valueID, FontC
         textStyle = kCTUIFontTextStyleTitle3;
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
         break;
-#endif
     case CSSValueAppleSystemSubheadline:
         textStyle = kCTUIFontTextStyleSubhead;
         fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(textStyle, contentSizeCategory(), 0));
index 29d455a..b8d2e99 100644 (file)
@@ -1106,7 +1106,7 @@ void SVGToOTFFontConverter::appendKERNTable()
     size_t sizeOfVerticalSubtable = appendKERNSubtable<SVGVKernElement>(&SVGVKernElement::buildVerticalKerningPair, 0);
     ASSERT_UNUSED(sizeOfVerticalSubtable, subtablesOffset + sizeOfHorizontalSubtable + sizeOfVerticalSubtable == m_result.size());
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
     // Work around a bug in Apple's font parser by adding some padding bytes. <rdar://problem/18401901>
     for (int i = 0; i < 6; ++i)
         m_result.append(0);
@@ -1404,7 +1404,7 @@ SVGToOTFFontConverter::SVGToOTFFontConverter(const SVGFontElement& fontElement)
             processGlyphElement(glyphElement, &glyphElement, defaultHorizontalAdvance, defaultVerticalAdvance, unicodeAttribute, initialGlyph);
     }
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED <= 80000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
     // <rdar://problem/20086223> Cocoa has a bug where glyph bounding boxes are not correctly respected for frustum culling. Work around this by
     // inflating the font's bounding box
     m_boundingBox.extend(FloatPoint(0, 0));
index 28bc3cb..9a9a143 100644 (file)
@@ -1,5 +1,27 @@
 2015-10-10  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove unnecessary iOS version checks
+        https://bugs.webkit.org/show_bug.cgi?id=150002
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Plugins/WebPluginController.h:
+        * Plugins/WebPluginController.mm:
+        (-[WebPluginController plugInViewWithArguments:fromPluginPackage:]):
+        (+[WebPluginController addPlugInView:]):
+        (+[WebPluginController plugInViewWithArguments:fromPluginPackage:]): Deleted.
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (pluginView):
+        * WebView/WebPreferences.mm:
+        (-[WebPreferences isDNSPrefetchingEnabled]):
+        (-[WebPreferences setWebInspectorServerEnabled:]): Deleted.
+        (-[WebPreferences _setAllowCompositingLayerVisualDegradation:]): Deleted.
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (shouldAllowPictureInPictureMediaPlayback):
+
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
         [iOS] Remove project support for iOS 8
         https://bugs.webkit.org/show_bug.cgi?id=149993
 
index 8f4f9b3..65f5826 100644 (file)
     NSMutableSet *_checksInProgress;
 }
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-+ (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
-#else
 - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)plugin;
-#endif
 + (BOOL)isPlugInView:(NSView *)view;
 
 - (id)initWithDocumentView:(NSView *)view;
index 77e9a8f..cc41afa 100644 (file)
@@ -119,23 +119,6 @@ static void initializeAudioSession()
 
 @implementation WebPluginController
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-+ (id)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
-{
-    initializeAudioSession();
-    [pluginPackage load];
-    Class viewFactory = [pluginPackage viewFactory];
-
-    id view = nil;
-
-    if ([viewFactory respondsToSelector:@selector(plugInViewWithArguments:)]) {
-        JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
-        view = [viewFactory plugInViewWithArguments:arguments];
-    }
-
-    return view;
-}
-#else
 - (NSView *)plugInViewWithArguments:(NSDictionary *)arguments fromPluginPackage:(WebPluginPackage *)pluginPackage
 {
 #if PLATFORM(IOS)
@@ -174,7 +157,6 @@ static void initializeAudioSession()
 
     return view;
 }
-#endif
 
 #if PLATFORM(IOS)
 + (void)addPlugInView:(NSView *)view
index 030689c..696d80e 100644 (file)
@@ -1770,13 +1770,8 @@ static NSView *pluginView(WebFrame *frame, WebPluginPackage *pluginPackage,
         LOG(Plugins, "arguments:\n%@", arguments);
     }
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-    view = [WebPluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
-    [attributes release];
-#else
     view = [pluginController plugInViewWithArguments:arguments fromPluginPackage:pluginPackage];
     [attributes release];
-#endif
 
     return view;
 }
index ac19753..e02a918 100644 (file)
@@ -1183,18 +1183,6 @@ public:
 
 @implementation WebPreferences (WebPrivate)
 
-#if PLATFORM(IOS) && !(__IPHONE_OS_VERSION_MIN_REQUIRED >= 60000)
-- (void) setWebInspectorServerEnabled:(BOOL)flag
-{
-}
-#endif
-
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag
-{
-}
-#endif
-
 - (BOOL)isDNSPrefetchingEnabled
 {
     return [self _boolValueForKey:WebKitDNSPrefetchingEnabledPreferenceKey];
index de427ec..ab15c53 100644 (file)
@@ -455,8 +455,4 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification;
 @property (nonatomic) BOOL javaScriptMarkupEnabled;
 @property (nonatomic) BOOL mediaDataLoadsAutomatically;
 
-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
-- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
-#endif
-
 @end
index 9cb8a47..ef8a783 100644 (file)
@@ -851,7 +851,7 @@ static bool shouldAllowDisplayAndRunningOfInsecureContent()
 
 static bool shouldAllowPictureInPictureMediaPlayback()
 {
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if PLATFORM(IOS)
     static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
     return shouldAllowPictureInPictureMediaPlayback;
 #else
index 286a6f6..f4ed804 100644 (file)
@@ -1,5 +1,69 @@
 2015-10-10  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove unnecessary iOS version checks
+        https://bugs.webkit.org/show_bug.cgi?id=150002
+
+        Reviewed by Alexey Proskuryakov.
+
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+        * Platform/IPC/mac/ConnectionMac.mm:
+        (IPC::AccessibilityProcessSuspendedNotification):
+        * Platform/spi/ios/SafariServicesSPI.h:
+        * Platform/spi/ios/UIKitSPI.h:
+        * Shared/Network/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::encode):
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * Shared/Network/NetworkProcessCreationParameters.h:
+        * Shared/Plugins/PluginProcessCreationParameters.cpp:
+        (WebKit::PluginProcessCreationParameters::encode):
+        (WebKit::PluginProcessCreationParameters::decode):
+        * Shared/Plugins/PluginProcessCreationParameters.h:
+        * Shared/WebEventConversion.cpp:
+        (WebKit::WebKit2PlatformTouchPoint::WebKit2PlatformTouchPoint):
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * Shared/ios/NativeWebTouchEventIOS.mm:
+        (WebKit::NativeWebTouchEvent::extractWebTouchPoint):
+        (WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+        * Shared/ios/WebPlatformTouchPointIOS.cpp:
+        (WebKit::WebPlatformTouchPoint::encode):
+        (WebKit::WebPlatformTouchPoint::decode):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+        (shouldAllowPictureInPictureMediaPlayback):
+        (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+        (WebKit::PluginProcessProxy::platformInitializePluginProcess):
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (-[WKSwipeTransitionController gestureRecognizerForInteractiveTransition:WithTarget:action:]):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView _ensureFormAccessoryView]):
+        (-[WKContentView webSelectionAssistant]):
+        (-[WKContentView selectionInteractionAssistant]):
+        * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+        (WebKit::WebVideoFullscreenManagerProxy::create):
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (photoLibraryIcon):
+        (cameraIcon):
+        (fallbackIconForFile):
+        (iconForImageFile):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::flushLayers):
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
         [iOS] Remove project support for iOS 8
         https://bugs.webkit.org/show_bug.cgi?id=149993
 
index a809cab..cd22084 100644 (file)
@@ -75,7 +75,7 @@ void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessC
 #endif
     m_diskCacheDirectory = parameters.diskCacheDirectory;
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     _CFNetworkSetATSContext(parameters.networkATSContext.get());
 #endif
 
index a7913e2..f5f9ce8 100644 (file)
@@ -613,7 +613,7 @@ static void AccessibilityProcessSuspendedNotification(bool suspended)
 {
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     _AXUIElementNotifyProcessSuspendStatus(suspended ? AXSuspendStatusSuspended : AXSuspendStatusRunning);
-#elif PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#elif PLATFORM(IOS)
     UIAccessibilityPostNotification(kAXPidStatusChangedNotification, @{ @"pid" : @(getpid()), @"suspended" : @(suspended) });
 #else
     UNUSED_PARAM(suspended);
index 5fd788f..36d6fd4 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE(SAFARI_SERVICES_FRAMEWORK) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if HAVE(SAFARI_SERVICES_FRAMEWORK)
 
 #import <WebCore/SoftLinking.h>
 #import <SafariServices/SFSafariViewController.h>
index 91536ce..d933381 100644 (file)
@@ -595,9 +595,7 @@ typedef enum {
 
 @property (nonatomic, assign, getter=isNextEnabled) BOOL nextEnabled;
 @property (nonatomic, assign, getter=isPreviousEnabled) BOOL previousEnabled;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
 - (id)initWithInputAssistantItem:(UITextInputAssistantItem *)inputAssistantItem;
-#endif
 @end
 
 @protocol UIWebFormAccessoryDelegate
@@ -643,9 +641,7 @@ struct _UIWebTouchEvent {
     struct _UIWebTouchPoint* touchPoints;
     unsigned touchPointCount;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     bool isPotentialTap;
-#endif
 };
 
 @protocol UIWebTouchEventsGestureRecognizerDelegate
index 2e81602..5aaa820 100644 (file)
@@ -72,7 +72,7 @@ void NetworkProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) con
     encoder << nsURLCacheDiskCapacity;
     encoder << httpProxy;
     encoder << httpsProxy;
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     IPC::encode(encoder, networkATSContext.get());
 #endif
 #endif
@@ -138,7 +138,7 @@ bool NetworkProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, Net
         return false;
     if (!decoder.decode(result.httpsProxy))
         return false;
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     if (!IPC::decode(decoder, result.networkATSContext))
         return false;
 #endif
index 8cf39ef..80b61ca 100644 (file)
@@ -84,7 +84,7 @@ struct NetworkProcessCreationParameters {
 
     String httpProxy;
     String httpsProxy;
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     RetainPtr<CFDataRef> networkATSContext;
 #endif
 #endif
index 401d819..e3e1ffd 100644 (file)
@@ -47,7 +47,7 @@ void PluginProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) cons
     encoder << terminationTimeout;
 #if PLATFORM(COCOA)
     encoder << acceleratedCompositingPort;
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     IPC::encode(encoder, networkATSContext.get());
 #endif
 #endif
@@ -66,7 +66,7 @@ bool PluginProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, Plug
 #if PLATFORM(COCOA)
     if (!decoder.decode(result.acceleratedCompositingPort))
         return false;
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     if (!IPC::decode(decoder, result.networkATSContext))
         return false;
 #endif
index 74f1a47..ac7d638 100644 (file)
@@ -55,7 +55,7 @@ struct PluginProcessCreationParameters {
 
 #if PLATFORM(COCOA)
     WebCore::MachSendRight acceleratedCompositingPort;
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     RetainPtr<CFDataRef> networkATSContext;
 #endif
 #endif
index 5c082af..3dd2ac8 100644 (file)
@@ -243,7 +243,7 @@ class WebKit2PlatformTouchPoint : public WebCore::PlatformTouchPoint {
 public:
 WebKit2PlatformTouchPoint(const WebPlatformTouchPoint& webTouchPoint)
     : PlatformTouchPoint(webTouchPoint.identifier(), webTouchPoint.location(), touchEventType(webTouchPoint)
-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if ENABLE(IOS_TOUCH_EVENTS)
     , webTouchPoint.force()
 #endif
     )
index 6270d8c..1294c97 100644 (file)
@@ -152,7 +152,7 @@ void WebProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
     encoder << pluginLoadClientPolicies;
 #endif
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     IPC::encode(encoder, networkATSContext.get());
 #endif
 }
@@ -318,7 +318,7 @@ bool WebProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebProc
         return false;
 #endif
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     if (!IPC::decode(decoder, parameters.networkATSContext))
         return false;
 #endif
index e7b18b9..a49402c 100644 (file)
@@ -173,7 +173,7 @@ struct WebProcessCreationParameters {
     HashMap<String, HashMap<String, HashMap<String, uint8_t>>> pluginLoadClientPolicies;
 #endif
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     RetainPtr<CFDataRef> networkATSContext;
 #endif
 };
index 00e7193..1952f43 100644 (file)
@@ -87,7 +87,7 @@ Vector<WebPlatformTouchPoint> NativeWebTouchEvent::extractWebTouchPoint(const _U
         WebCore::IntPoint location = positionForCGPoint(touchPoint.locationInDocumentCoordinates);
         WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase(touchPoint.phase);
         WebPlatformTouchPoint platformTouchPoint = WebPlatformTouchPoint(identifier, location, phase);
-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if ENABLE(IOS_TOUCH_EVENTS)
         platformTouchPoint.setForce(touchPoint.force);
 #endif
         touchPointList.uncheckedAppend(platformTouchPoint);
@@ -102,7 +102,7 @@ NativeWebTouchEvent::NativeWebTouchEvent(const _UIWebTouchEvent* event)
         event->timestamp,
         extractWebTouchPoint(event),
         positionForCGPoint(event->locationInDocumentCoordinates),
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP
+#if defined UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP && UI_WEB_TOUCH_EVENT_HAS_IS_POTENTIAL_TAP
         event->isPotentialTap,
 #else
         true,
index a241c9e..c598177 100644 (file)
@@ -40,7 +40,7 @@ void WebPlatformTouchPoint::encode(IPC::ArgumentEncoder& encoder) const
     encoder << m_identifier;
     encoder << m_location;
     encoder << m_phase;
-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if ENABLE(IOS_TOUCH_EVENTS)
     encoder << m_force;
 #endif
 }
@@ -53,7 +53,7 @@ bool WebPlatformTouchPoint::decode(IPC::ArgumentDecoder& decoder, WebPlatformTou
         return false;
     if (!decoder.decode(result.m_phase))
         return false;
-#if ENABLE(IOS_TOUCH_EVENTS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if ENABLE(IOS_TOUCH_EVENTS)
     if (!decoder.decode(result.m_force))
         return false;
 #endif
index 6310dd9..a3c0a6d 100644 (file)
@@ -255,7 +255,7 @@ static int32_t deviceOrientation()
 
 - (BOOL)_mayAutomaticallyShowVideoPictureInPicture
 {
-#if (__IPHONE_OS_VERSION_MIN_REQUIRED <= 80200) || !HAVE(AVKIT)
+#if !HAVE(AVKIT)
     return false;
 #else
     if (!_page || !_page->videoFullscreenManager())
@@ -267,12 +267,8 @@ static int32_t deviceOrientation()
 
 static bool shouldAllowPictureInPictureMediaPlayback()
 {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     static bool shouldAllowPictureInPictureMediaPlayback = iosExecutableWasLinkedOnOrAfterVersion(wkIOSSystemVersion_9_0);
     return shouldAllowPictureInPictureMediaPlayback;
-#else
-    return false;
-#endif
 }
 
 #endif
@@ -2937,20 +2933,12 @@ static inline WebKit::FindOptions toFindOptions(_WKFindOptions wkFindOptions)
 
 #if USE(IOSURFACE)
     // If we are parented and thus won't incur a significant penalty from paging in tiles, snapshot the view hierarchy directly.
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     if (CADisplay *display = self.window.screen._display) {
-#else
-    if (self.window) {
-#endif
         auto surface = WebCore::IOSurface::create(WebCore::expandedIntSize(WebCore::FloatSize(imageSize)), WebCore::ColorSpaceDeviceRGB);
         CGFloat imageScaleInViewCoordinates = imageWidth / rectInViewCoordinates.size.width;
         CATransform3D transform = CATransform3DMakeScale(imageScaleInViewCoordinates, imageScaleInViewCoordinates, 1);
         transform = CATransform3DTranslate(transform, -rectInViewCoordinates.origin.x, -rectInViewCoordinates.origin.y, 0);
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
         CARenderServerRenderDisplayLayerWithTransformAndTimeOffset(MACH_PORT_NULL, (CFStringRef)display.name, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform, 0);
-#else
-        CARenderServerRenderLayerWithTransform(MACH_PORT_NULL, self.layer.context.contextId, reinterpret_cast<uint64_t>(self.layer), surface->surface(), 0, 0, &transform); 
-#endif
         completionHandler(surface->createImage().get());
         return;
     }
index 99533c7..8bb974c 100644 (file)
@@ -220,7 +220,7 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
             [(NSData *)data release];
         }, data.leakRef());
     }
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
 #endif
 
@@ -248,7 +248,7 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
 
     parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
     parameters.httpsProxy = [defaults stringForKey:WebKit2HTTPSProxyDefaultsKey];
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
 #endif
 
index 199d7d0..180bcdb 100644 (file)
@@ -169,7 +169,7 @@ void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationPa
 #if HAVE(HOSTED_CORE_ANIMATION)
     parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
 #endif
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
 #endif
 }
index 1fda0b1..2f48dbb 100644 (file)
@@ -116,11 +116,7 @@ static const float swipeSnapshotRemovalRenderTreeSizeTargetFraction = 0.5;
 {
     UIScreenEdgePanGestureRecognizer *recognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:target action:action];
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     bool isLTR = [UIView userInterfaceLayoutDirectionForSemanticContentAttribute:[_gestureRecognizerView.get() semanticContentAttribute]] == UIUserInterfaceLayoutDirectionLeftToRight;
-#else
-    bool isLTR = true;
-#endif
 
     switch ([self directionForTransition:transition]) {
     case WebKit::ViewGestureController::SwipeDirection::Back:
index 03c4aa0..af204f3 100644 (file)
@@ -215,7 +215,6 @@ const CGFloat minimumTapHighlightRadius = 2.0;
 + (BOOL)_addCompletion:(void(^)(BOOL))completion;
 @end
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
 @protocol UISelectionInteractionAssistant;
 #if HAVE(LINK_PREVIEW)
 @interface UIPreviewItemController (StagingToRemove)
@@ -223,8 +222,6 @@ const CGFloat minimumTapHighlightRadius = 2.0;
 @end
 #endif
 
-#endif
-
 @interface WKFormInputSession : NSObject <_WKFormInputSession>
 
 - (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject;
@@ -342,9 +339,7 @@ static UIWebSelectionMode toUIWebSelectionMode(WKSelectionGranularity granularit
     _longPressGestureRecognizer = adoptNS([[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(_longPressRecognized:)]);
     [_longPressGestureRecognizer setDelay:tapAndHoldDelay];
     [_longPressGestureRecognizer setDelegate:self];
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     [_longPressGestureRecognizer _setRequiresQuietImpulse:YES];
-#endif
     [self addGestureRecognizer:_longPressGestureRecognizer.get()];
 
 #if HAVE(LINK_PREVIEW)
@@ -1271,11 +1266,7 @@ static void cancelPotentialTapIfNecessary(WKContentView* contentView)
     if (_formAccessoryView)
         return;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] initWithInputAssistantItem:self.inputAssistantItem]);
-#else
-    _formAccessoryView = adoptNS([[UIWebFormAccessory alloc] init]);
-#endif
     [_formAccessoryView setDelegate:self];
 }
 
@@ -2563,14 +2554,12 @@ static UITextAutocapitalizationType toUITextAutocapitalize(WebAutocapitalizeType
     return _webSelectionAssistant.get();
 }
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
 - (id<UISelectionInteractionAssistant>)selectionInteractionAssistant
 {
     if ([_webSelectionAssistant conformsToProtocol:@protocol(UISelectionInteractionAssistant)])
         return (id<UISelectionInteractionAssistant>)_webSelectionAssistant.get();
     return nil;
 }
-#endif
 
 // NSRange support.  Would like to deprecate to the extent possible, although some support
 // (i.e. selectionRange) has shipped as API.
index a3c5953..f4520fe 100644 (file)
@@ -67,7 +67,7 @@ using namespace WebCore;
 
 namespace WebKit {
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000 || !HAVE(AVKIT)
+#if !HAVE(AVKIT)
 
 RefPtr<WebVideoFullscreenManagerProxy> WebVideoFullscreenManagerProxy::create(WebPageProxy&)
 {
index 754f467..79ad902 100644 (file)
@@ -71,7 +71,7 @@ SOFT_LINK_CONSTANT(Photos, PHImageRequestOptionsVersionCurrent, NSString *);
 static inline UIImage *photoLibraryIcon()
 {
     // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
+#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
     return _UIImageGetWebKitPhotoLibraryIcon();
 #else
     return nil;
@@ -81,7 +81,7 @@ static inline UIImage *photoLibraryIcon()
 static inline UIImage *cameraIcon()
 {
     // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
+#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
     return _UIImageGetWebKitTakePhotoOrVideoIcon();
 #else
     return nil;
@@ -139,11 +139,7 @@ static UIImage* fallbackIconForFile(NSURL *file)
     ASSERT_ARG(file, [file isFileURL]);
 
     UIDocumentInteractionController *interactionController = [UIDocumentInteractionController interactionControllerWithURL:file];
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 90000
-    return thumbnailSizedImageForImage(((UIImage *)interactionController.icons[0]).CGImage);
-#else
     return thumbnailSizedImageForImage(interactionController.icons[0].CGImage);
-#endif
 }
 
 static UIImage* iconForImageFile(NSURL *file)
index 51c2f72..3294c4a 100644 (file)
@@ -357,7 +357,7 @@ void RemoteLayerTreeDrawingArea::flushLayers()
     FloatRect visibleRect(FloatPoint(), m_viewSize);
     visibleRect.intersect(m_scrolledExposedRect);
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     RefPtr<WebPage> retainedPage = &m_webPage;
     [CATransaction addCommitHandler:[retainedPage] {
         if (Page* corePage = retainedPage->corePage()) {
index 9d1a9be..2727289 100644 (file)
@@ -419,7 +419,7 @@ bool TiledCoreAnimationDrawingArea::flushLayers()
         if (m_viewOverlayRootLayer)
             m_viewOverlayRootLayer->flushCompositingState(visibleRect, m_webPage.mainFrameView()->viewportIsStable());
 
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
         RefPtr<WebPage> retainedPage = &m_webPage;
         [CATransaction addCommitHandler:[retainedPage] {
             if (Page* corePage = retainedPage->corePage()) {
index 9d972c6..0348f0f 100644 (file)
@@ -167,11 +167,11 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par
     Method methodToPatch = class_getInstanceMethod([NSApplication class], @selector(accessibilityFocusedUIElement));
     method_setImplementation(methodToPatch, (IMP)NSApplicationAccessibilityFocusedUIElement);
 #endif
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+#if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
     _CFNetworkSetATSContext(parameters.networkATSContext.get());
 #endif
 
-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if TARGET_OS_IPHONE
     // Priority decay on iOS 9 is impacting page load time so we fix the priority of the WebProcess' main thread (rdar://problem/22003112).
     pthread_set_fixedpriority_self();
 #endif
index 4239ff2..da825ec 100644 (file)
@@ -1,3 +1,16 @@
+2015-10-10  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove unnecessary iOS version checks
+        https://bugs.webkit.org/show_bug.cgi?id=150002
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        (-[HIDEventGenerator _createIOHIDEventType:]):
+        (-[HIDEventGenerator _sendHIDEvent:]):
+        (-[HIDEventGenerator _sendMarkerHIDEventWithCompletionBlock:]):
+        * WebKitTestRunner/ios/UIKitSPI.h:
+
 2015-10-09  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Unreviewed, rolling out r190689
index 7a0d0fb..620f078 100644 (file)
@@ -205,7 +205,6 @@ static void delayBetweenMove(int eventIndex, double elapsed)
         IOHIDEventAppendEvent(eventRef.get(), subEvent.get(), 0);
     }
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
     if (_activePointCount) {
         IOHIDFloat progress = _activePoints[0].pathPressure;
         RetainPtr<IOHIDEventRef> forceEvent = adoptCF(IOHIDEventCreateForceEvent(kCFAllocatorDefault,
@@ -217,7 +216,6 @@ static void delayBetweenMove(int eventIndex, double elapsed)
             kIOHIDEventOptionNone));
         IOHIDEventAppendEvent(eventRef.get(), forceEvent.get(), 0);
     }
-#endif
 
     return eventRef.leakRef();
 }
@@ -233,9 +231,7 @@ static void delayBetweenMove(int eventIndex, double elapsed)
             uint32_t contextID = [UIApplication sharedApplication].keyWindow._contextId;
             ASSERT(contextID);
             BKSHIDEventSetDigitizerInfo(strongEvent.get(), contextID, false, false, NULL, 0, 0);
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
             [[UIApplication sharedApplication] _enqueueHIDEvent:strongEvent.get()];
-#endif
         });
     }
     return YES;
@@ -263,9 +259,7 @@ static void delayBetweenMove(int eventIndex, double elapsed)
             uint32_t contextID = [UIApplication sharedApplication].keyWindow._contextId;
             ASSERT(contextID);
             BKSHIDEventSetDigitizerInfo(markerEvent.get(), contextID, false, false, NULL, 0, 0);
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
             [[UIApplication sharedApplication] _enqueueHIDEvent:markerEvent.get()];
-#endif
         });
     }
     return YES;
index 1d50518..ef914b2 100644 (file)
@@ -42,9 +42,7 @@
 #import "IOKitSPI.h"
 
 @interface UIApplication ()
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
 - (void)_enqueueHIDEvent:(IOHIDEventRef)event;
-#endif
 - (void)_handleHIDEvent:(IOHIDEventRef)event;
 @end