[iOS] Remove code only needed when building for iOS 9.x
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 2 Jul 2017 02:06:40 +0000 (02:06 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 2 Jul 2017 02:06:40 +0000 (02:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174068

Reviewed by Tim Horton.

Source/bmalloc:

* bmalloc/BPlatform.h:
* bmalloc/VMAllocate.h:
(bmalloc::vmPageSizePhysical):

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:
* jit/ExecutableAllocator.cpp:
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:
* editing/cocoa/DataDetection.mm:
(WebCore::DataDetection::isDataDetectorLink):
(WebCore::DataDetection::shouldCancelDefaultAction):
(WebCore::constructURLStringForResult):
(WebCore::DataDetection::detectContentInRange):
* page/cocoa/ResourceUsageThreadCocoa.mm:
(WebCore::vmPageSize):
* platform/cocoa/DataDetectorsCoreSoftLink.h:
* platform/cocoa/DataDetectorsCoreSoftLink.mm:
* platform/graphics/FontPlatformData.cpp:
* platform/graphics/FontPlatformData.h:
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(layerContentsFormat):
(PlatformCALayerCocoa::updateContentsFormat):
(PlatformCALayerCocoa::backingStoreBytesPerPixel):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::extendedSRGBColorSpaceRef):
* platform/graphics/cg/PDFDocumentImage.cpp:
(WebCore::PDFDocumentImage::drawPDFPage):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::lookupFallbackFont):
* platform/graphics/cocoa/FontCocoa.mm:
(WebCore::Font::variantCapsSupportsCharacterForSynthesis):
(WebCore::Font::platformWidthForGlyph):
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::ctFont):
* platform/graphics/cocoa/IOSurface.mm:
(WebCore::IOSurface::sinkIntoImage):
* platform/graphics/cocoa/WebCoreDecompressionSession.mm:
(WebCore::WebCoreDecompressionSession::setTimebase):
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::systemFontModificationAttributes):
(WebCore::systemFontDescriptor):
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::supportsFormat):
* platform/ios/LegacyTileGridTile.mm:
(WebCore::LegacyTileGridTile::LegacyTileGridTile):
* platform/ios/PlatformScreenIOS.mm:
(WebCore::screenSupportsExtendedColor):
* platform/ios/RemoteCommandListenerIOS.mm:
(WebCore::RemoteCommandListenerIOS::RemoteCommandListenerIOS):
(WebCore::RemoteCommandListenerIOS::~RemoteCommandListenerIOS):
(WebCore::RemoteCommandListenerIOS::updateSupportedCommands):
* platform/spi/cf/CFNetworkSPI.h:
* platform/spi/cg/CoreGraphicsSPI.h:
* platform/spi/cocoa/DataDetectorsCoreSPI.h:
* platform/spi/cocoa/QuartzCoreSPI.h:
* platform/spi/mac/AVFoundationSPI.h:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

* Configurations/FeatureDefines.xcconfig:
* Configurations/WebKit.xcconfig:
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView dealloc]):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKFormInputSession setSuggestions:]):
(-[WKFormInputSession invalidate]):
(-[WKContentView insertTextSuggestion:]):
(contentTypeFromFieldName):
(-[WKContentView textInputTraits]):
(-[WKContentView _dataForPreviewItemController:atPosition:type:]):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
* config.h:

Source/WTF:

* wtf/Platform.h:
* wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
* wtf/spi/darwin/dyldSPI.h:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::initializeWebViewConfiguration):
* WebKitTestRunner/ios/HIDEventGenerator.mm:
(-[HIDEventGenerator _createIOHIDEventType:]):

WebKitLibraries:

* WebKitPrivateFrameworkStubs/iOS/9: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework: Removed.
* WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd: Removed.

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

59 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/jit/ExecutableAllocator.cpp
Source/JavaScriptCore/runtime/Options.cpp
Source/WTF/ChangeLog
Source/WTF/wtf/Platform.h
Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm
Source/WTF/wtf/spi/darwin/dyldSPI.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/editing/cocoa/DataDetection.mm
Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm
Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h
Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm
Source/WebCore/platform/graphics/FontPlatformData.cpp
Source/WebCore/platform/graphics/FontPlatformData.h
Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
Source/WebCore/platform/graphics/cocoa/IOSurface.mm
Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm
Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
Source/WebCore/platform/ios/LegacyTileGridTile.mm
Source/WebCore/platform/ios/PlatformScreenIOS.mm
Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm
Source/WebCore/platform/spi/cf/CFNetworkSPI.h
Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h
Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
Source/WebCore/platform/spi/mac/AVFoundationSPI.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/WebKit2/Configurations/WebKit.xcconfig
Source/WebKit2/Platform/spi/ios/UIKitSPI.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
Source/WebKit2/config.h
Source/bmalloc/ChangeLog
Source/bmalloc/bmalloc/BPlatform.h
Source/bmalloc/bmalloc/VMAllocate.h
Tools/ChangeLog
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
Tools/WebKitTestRunner/ios/HIDEventGenerator.mm
WebKitLibraries/ChangeLog
WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd [deleted file]
WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd [deleted file]
WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd [deleted file]
WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd [deleted file]
WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd [deleted file]

index 7b91952..19e67b2 100644 (file)
@@ -1,5 +1,17 @@
 2017-07-01  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * jit/ExecutableAllocator.cpp:
+        * runtime/Options.cpp:
+        (JSC::recomputeDependentOptions):
+
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
         [macOS] Remove code only needed when building for OS X Yosemite
         https://bugs.webkit.org/show_bug.cgi?id=174067
 
index 9e56e68..2e496d3 100644 (file)
@@ -45,8 +45,6 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW
 ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 
 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
index 3e7b66a..ca06b03 100644 (file)
 #include "LinkBuffer.h"
 #include "MacroAssembler.h"
 
-#if PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if PLATFORM(COCOA)
 #define HAVE_REMAP_JIT 1
 #endif
 
 #if HAVE(REMAP_JIT)
-#if CPU(ARM64) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if CPU(ARM64) && PLATFORM(IOS)
 #define USE_EXECUTE_ONLY_JIT_WRITE_FUNCTION 1
 #endif
 #endif
index b92082d..430eacf 100644 (file)
@@ -458,7 +458,7 @@ static void recomputeDependentOptions()
         Options::useOSREntryToFTL() = false;
     }
     
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
     // Override globally for now. Longer term we'll just make the default
     // be to have this option enabled, and have platforms that don't support
     // it just silently use a single mapping.
index 06ca92d..1e2bf5f 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+        * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
+        * wtf/spi/darwin/dyldSPI.h:
+
 2017-07-01  Caio Lima  <ticaiolima@gmail.com>
 
         [JSC] WTFGetBacktrace can return numberOfFrames == 0 in some architectures
index 3b05071..c06d280 100644 (file)
 
 #if PLATFORM(IOS)
 
-#if USE(APPLE_INTERNAL_SDK) \
-    && ((TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
-     || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
-     || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000))
-#define USE_CFURLCONNECTION 1
-#endif
-
 #define HAVE_NETWORK_EXTENSION 1
 #define HAVE_READLINE 1
 #define USE_UIKIT_EDITING 1
 
 #endif /* OS(DARWIN) */
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
 #endif
 
 #endif
 
 /* FIXME: Enable USE_OS_LOG when building with the public iOS 10 SDK once we fix <rdar://problem/27758343>. */
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 && USE(APPLE_INTERNAL_SDK))
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK))
 #define USE_OS_LOG 1
 #if USE(APPLE_INTERNAL_SDK)
 #define USE_OS_STATE 1
 #endif
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
 #define HAVE_SEC_TRUST_SERIALIZATION 1
 #endif
 
index c2d9d3b..cf578fb 100644 (file)
@@ -38,7 +38,7 @@
 
 namespace WTF {
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
 WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context);
 WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context);
 
index 0099c6b..96ad2a6 100644 (file)
 
 #include <mach-o/dyld_priv.h>
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000
-#define DYLD_IOS_VERSION_10_0 0x000A0000
-#endif
-
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
 #define DYLD_MACOSX_VERSION_10_12 0x000A0C00
 #endif
index 56b26a2..be20675 100644 (file)
@@ -1,3 +1,61 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * editing/cocoa/DataDetection.mm:
+        (WebCore::DataDetection::isDataDetectorLink):
+        (WebCore::DataDetection::shouldCancelDefaultAction):
+        (WebCore::constructURLStringForResult):
+        (WebCore::DataDetection::detectContentInRange):
+        * page/cocoa/ResourceUsageThreadCocoa.mm:
+        (WebCore::vmPageSize):
+        * platform/cocoa/DataDetectorsCoreSoftLink.h:
+        * platform/cocoa/DataDetectorsCoreSoftLink.mm:
+        * platform/graphics/FontPlatformData.cpp:
+        * platform/graphics/FontPlatformData.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        (layerContentsFormat):
+        (PlatformCALayerCocoa::updateContentsFormat):
+        (PlatformCALayerCocoa::backingStoreBytesPerPixel):
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::extendedSRGBColorSpaceRef):
+        * platform/graphics/cg/PDFDocumentImage.cpp:
+        (WebCore::PDFDocumentImage::drawPDFPage):
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::lookupFallbackFont):
+        * platform/graphics/cocoa/FontCocoa.mm:
+        (WebCore::Font::variantCapsSupportsCharacterForSynthesis):
+        (WebCore::Font::platformWidthForGlyph):
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        (WebCore::FontPlatformData::FontPlatformData):
+        (WebCore::FontPlatformData::ctFont):
+        * platform/graphics/cocoa/IOSurface.mm:
+        (WebCore::IOSurface::sinkIntoImage):
+        * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
+        (WebCore::WebCoreDecompressionSession::setTimebase):
+        * platform/graphics/ios/FontCacheIOS.mm:
+        (WebCore::systemFontModificationAttributes):
+        (WebCore::systemFontDescriptor):
+        * platform/graphics/mac/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::supportsFormat):
+        * platform/ios/LegacyTileGridTile.mm:
+        (WebCore::LegacyTileGridTile::LegacyTileGridTile):
+        * platform/ios/PlatformScreenIOS.mm:
+        (WebCore::screenSupportsExtendedColor):
+        * platform/ios/RemoteCommandListenerIOS.mm:
+        (WebCore::RemoteCommandListenerIOS::RemoteCommandListenerIOS):
+        (WebCore::RemoteCommandListenerIOS::~RemoteCommandListenerIOS):
+        (WebCore::RemoteCommandListenerIOS::updateSupportedCommands):
+        * platform/spi/cf/CFNetworkSPI.h:
+        * platform/spi/cg/CoreGraphicsSPI.h:
+        * platform/spi/cocoa/DataDetectorsCoreSPI.h:
+        * platform/spi/cocoa/QuartzCoreSPI.h:
+        * platform/spi/mac/AVFoundationSPI.h:
+
 2017-07-01  Myles C. Maxfield  <mmaxfield@apple.com>
 
         REGRESSION(r218371): Reeder's default font is Times instead of San Francisco
index 9e56e68..2e496d3 100644 (file)
@@ -45,8 +45,6 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW
 ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 
 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
index 1d6a25c..d775157 100644 (file)
@@ -1,5 +1,14 @@
 2017-07-01  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
         [macOS] Remove code only needed when building for OS X Yosemite
         https://bugs.webkit.org/show_bug.cgi?id=174067
 
index 9e56e68..2e496d3 100644 (file)
@@ -45,8 +45,6 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW
 ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 
 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
index 4d160af..8bcf3fe 100644 (file)
@@ -157,14 +157,7 @@ bool DataDetection::isDataDetectorLink(Element& element)
     if (!is<HTMLAnchorElement>(element))
         return false;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().toStringWithoutCopying().convertToASCIILowercase()];
-#else
-    if (equalIgnoringASCIICase(element.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
-        return true;
-    URL url = downcast<HTMLAnchorElement>(element).href();
-    return url.protocolIs("mailto") || url.protocolIs("tel");
-#endif
 }
 
 bool DataDetection::requiresExtendedContext(Element& element)
@@ -179,7 +172,6 @@ String DataDetection::dataDetectorIdentifier(Element& element)
 
 bool DataDetection::shouldCancelDefaultAction(Element& element)
 {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     if (!isDataDetectorLink(element))
         return false;
     
@@ -201,16 +193,6 @@ bool DataDetection::shouldCancelDefaultAction(Element& element)
         result = (DDResultRef)[results objectAtIndex:resultIndices[i].toInt()];
     }
     return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result);
-#else
-    if (!is<HTMLAnchorElement>(element))
-        return false;
-    if (!equalLettersIgnoringASCIICase(element.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
-        return false;
-    auto& type = element.attributeWithoutSynchronization(x_apple_data_detectors_typeAttr);
-    if (equalLettersIgnoringASCIICase(type, "misc") || equalLettersIgnoringASCIICase(type, "calendar-event") || equalLettersIgnoringASCIICase(type, "telephone"))
-        return true;
-    return false;
-#endif
 }
 
 static BOOL resultIsURL(DDResultRef result)
@@ -234,9 +216,7 @@ static NSString *constructURLStringForResult(DDResultRef currentResult, NSString
     if (((detectionTypes & DataDetectorTypeAddress) && (DDResultCategoryAddress == category))
         || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
         || ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
         || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(get_DataDetectorsCore_DDBinderParsecSourceKey(), type, 0) == kCFCompareEqualTo))
-#endif
         || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
         || ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
         
@@ -438,11 +418,9 @@ NSArray *DataDetection::detectContentInRange(RefPtr<Range>& contextRange, DataDe
     RetainPtr<DDScanQueryRef> scanQuery = adoptCF(softLink_DataDetectorsCore_DDScanQueryCreate(NULL));
     buildQuery(scanQuery.get(), contextRange.get());
     
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     if (types & DataDetectorTypeLookupSuggestion)
         softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
-#endif
-    
+
     // FIXME: we should add a timeout to this call to make sure it doesn't take too much time.
     if (!softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), scanQuery.get()))
         return nil;
@@ -569,11 +547,7 @@ NSArray *DataDetection::detectContentInRange(RefPtr<Range>& contextRange, DataDe
         }
         
         lastModifiedQueryOffset = queryRange.end;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
         BOOL shouldUseLightLinks = softLink_DataDetectorsCore_DDShouldUseLightLinksForResult(coreResult, [indexPaths[resultIndex] length] > 1);
-#else
-        BOOL shouldUseLightLinks = NO;
-#endif
 
         for (auto& range : resultRanges) {
             auto* parentNode = range->startContainer().parentNode();
index a30ef21..e17329f 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 
 size_t vmPageSize()
 {
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if PLATFORM(IOS)
     return vm_kernel_page_size;
 #else
     static size_t cached = sysconf(_SC_PAGESIZE);
index be66e20..84f4a09 100644 (file)
@@ -49,13 +49,11 @@ SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultHasProperties,
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetSubResults, CFArrayRef, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
-#endif
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderMailURLKey, CFStringRef)
@@ -67,9 +65,7 @@ SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderSignatureBlockK
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDURLScheme, NSString *)
 SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
-#endif
 
 #endif // PLATFORM(IOS)
 
index 81111ad..798e866 100644 (file)
@@ -47,13 +47,11 @@ SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultHasProperties,
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetSubResults, CFArrayRef, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
-#endif
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderMailURLKey, CFStringRef)
@@ -65,8 +63,6 @@ SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderSignatureBlockK
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLScheme, NSString *)
 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
-#endif
 
 #endif // PLATFORM(IOS) && ENABLE(DATA_DETECTION)
index e41902c..4568ca9 100644 (file)
@@ -56,7 +56,7 @@ FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheti
 {
 }
 
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
     : FontPlatformData(size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
 {
index fd94649..45db147 100644 (file)
@@ -86,7 +86,7 @@ public:
     static FontPlatformData cloneWithSyntheticOblique(const FontPlatformData&, bool);
     static FontPlatformData cloneWithSize(const FontPlatformData&, float);
 
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
     FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant, TextRenderingMode);
 #endif
 
@@ -138,7 +138,7 @@ public:
 
     bool hasVariations() const { return m_hasVariations; }
 
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
     CGFontRef cgFont() const { return m_cgFont.get(); }
 #endif
 
@@ -227,7 +227,7 @@ private:
     RefPtr<SharedGDIObject<HFONT>> m_font;
 #endif
 
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
     RetainPtr<CGFontRef> m_cgFont;
 #endif
 
index 04e705f..4ad0eef 100644 (file)
@@ -1009,10 +1009,10 @@ void PlatformCALayerCocoa::updateCustomAppearance(GraphicsLayer::CustomAppearanc
 #endif
 }
 
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
 static NSString *layerContentsFormat(bool acceleratesDrawing, bool wantsDeepColor, bool supportsSubpixelAntialiasedFonts)
 {
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS)
     if (wantsDeepColor)
         return kCAContentsFormatRGBA10XR;
 #else
@@ -1035,7 +1035,7 @@ void PlatformCALayerCocoa::updateContentsFormat()
 {
     if (m_layerType == LayerTypeWebLayer || m_layerType == LayerTypeTiledBackingTileLayer) {
         BEGIN_BLOCK_OBJC_EXCEPTIONS
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
         if (NSString *formatString = layerContentsFormat(acceleratesDrawing(), wantsDeepColorBackingStore(), supportsSubpixelAntialiasedText()))
             [m_layer setContentsFormat:formatString];
 #endif
@@ -1209,7 +1209,7 @@ void PlatformCALayerCocoa::enumerateRectsBeingDrawn(CGContextRef context, void (
 
 unsigned PlatformCALayerCocoa::backingStoreBytesPerPixel() const
 {
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS)
     if (wantsDeepColorBackingStore())
         return isOpaque() ? 4 : 5;
 #endif
index c2d227b..f7003c1 100644 (file)
@@ -97,7 +97,7 @@ CGColorSpaceRef sRGBColorSpaceRef()
 CGColorSpaceRef extendedSRGBColorSpaceRef()
 {
     static CGColorSpaceRef extendedSRGBSpace;
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     extendedSRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
 #endif
     // If there is no support for exteneded sRGB, fall back to sRGB.
index 7efee4d..5b43323 100644 (file)
@@ -351,7 +351,7 @@ void PDFDocumentImage::drawPDFPage(GraphicsContext& context)
     notImplemented();
 #else
     // CGPDF pages are indexed from 1.
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
     CGContextDrawPDFPageWithAnnotations(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1), nullptr);
 #else
     CGContextDrawPDFPage(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1));
index 19dc223..9feffad 100644 (file)
@@ -1280,7 +1280,7 @@ static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontSelectionValu
     ASSERT(length > 0);
 
     RetainPtr<CFStringRef> localeString;
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     if (!locale.isNull())
         localeString = locale.string().createCFString();
 #else
@@ -1289,7 +1289,7 @@ static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontSelectionValu
 
     CFIndex coveredLength = 0;
     RetainPtr<CTFontRef> result;
-#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
+#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
     result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
 #else
     result = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
index 73e524b..7a1f0f3 100644 (file)
@@ -237,7 +237,7 @@ void Font::platformDestroy()
 
 bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantCaps, UChar32 character) const
 {
-#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     Glyph glyph = glyphForCharacter(character);
     if (!glyph)
         return false;
@@ -279,7 +279,7 @@ bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantC
 #endif
 }
 
-#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
 static RetainPtr<CFDictionaryRef> smallCapsOpenTypeDictionary(CFStringRef key, int rawValue)
 {
     RetainPtr<CFNumberRef> value = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawValue));
@@ -584,7 +584,7 @@ FloatRect Font::platformBoundsForGlyph(Glyph glyph) const
     return boundingBox;
 }
 
-#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
+#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
 static inline std::optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
 {
     CTFontRef font = platformData.font();
@@ -614,7 +614,7 @@ float Font::platformWidthForGlyph(Glyph glyph) const
     bool horizontal = platformData().orientation() == Horizontal;
     CGFontRenderingStyle style = kCGFontRenderingStyleAntialiasing | kCGFontRenderingStyleSubpixelPositioning | kCGFontRenderingStyleSubpixelQuantization | kCGFontAntialiasingStyleUnfiltered;
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
     if (platformData().size()) {
         CTFontOrientation orientation = horizontal || m_isBrokenIdeographFallback ? kCTFontOrientationHorizontal : kCTFontOrientationVertical;
         // FIXME: Remove this special-casing when <rdar://problem/28197291> and <rdar://problem/28662086> are fixed.
index bd8567c..504258e 100644 (file)
@@ -40,7 +40,7 @@ namespace WebCore {
 enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidth, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth };
 
 FontPlatformData::FontPlatformData(CTFontRef font, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
     : FontPlatformData(adoptCF(CTFontCopyGraphicsFont(font, NULL)).get(), size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
 #else
     : FontPlatformData(size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
@@ -162,7 +162,7 @@ CTFontRef FontPlatformData::ctFont() const
         return m_ctFont.get();
 
     ASSERT(m_font);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
     ASSERT(m_cgFont);
 #endif
     m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_font.get(), m_size, 0, cascadeToLastResortAndVariationsFontDescriptor(m_font.get()).get()));
index 376927c..db2f14d 100644 (file)
@@ -253,11 +253,7 @@ RetainPtr<CGImageRef> WebCore::IOSurface::createImage()
 
 RetainPtr<CGImageRef> WebCore::IOSurface::sinkIntoImage(std::unique_ptr<IOSurface> surface)
 {
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || PLATFORM(MAC)
     return adoptCF(CGIOSurfaceContextCreateImageReference(surface->ensurePlatformContext()));
-#else
-    return surface->createImage();
-#endif
 }
 
 void WebCore::IOSurface::setContextSize(IntSize contextSize)
index 7cd5f8c..258f949 100644 (file)
@@ -77,7 +77,7 @@ void WebCoreDecompressionSession::setTimebase(CMTimebaseRef timebase)
             dispatch_source_set_event_handler(m_timerSource.get(), [this] {
                 automaticDequeue();
             });
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
             dispatch_activate(m_timerSource.get());
 #endif
         }
index 3ebec22..0bdd576 100644 (file)
@@ -95,7 +95,6 @@ static RetainPtr<CTFontDescriptorRef> baseSystemFontDescriptor(FontSelectionValu
     return adoptCF(CTFontDescriptorCreateForUIType(fontType, size, nullptr));
 }
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 static RetainPtr<NSDictionary> systemFontModificationAttributes(FontSelectionValue weight, bool italic)
 {
     RetainPtr<NSMutableDictionary> traitsDictionary = adoptNS([[NSMutableDictionary alloc] init]);
@@ -128,19 +127,12 @@ static RetainPtr<NSDictionary> systemFontModificationAttributes(FontSelectionVal
 
     return @{ static_cast<NSString *>(kCTFontTraitsAttribute) : traitsDictionary.get() };
 }
-#endif
 
 static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontSelectionValue weight, bool bold, bool italic, float size)
 {
     RetainPtr<CTFontDescriptorRef> fontDescriptor = baseSystemFontDescriptor(weight, bold, size);
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     RetainPtr<NSDictionary> attributes = systemFontModificationAttributes(weight, italic);
     return adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), static_cast<CFDictionaryRef>(attributes.get())));
-#else
-    if (italic)
-        return adoptCF(CTFontDescriptorCreateCopyWithSymbolicTraits(fontDescriptor.get(), kCTFontItalicTrait, kCTFontItalicTrait));
-    return fontDescriptor;
-#endif
 }
 
 RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest request, float size)
index fae1c13..783bbea 100644 (file)
@@ -60,7 +60,7 @@ bool FontCustomPlatformData::supportsFormat(const String& format)
 {
     return equalLettersIgnoringASCIICase(format, "truetype")
         || equalLettersIgnoringASCIICase(format, "opentype")
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
         || equalLettersIgnoringASCIICase(format, "woff2")
 #if ENABLE(VARIATION_FONTS)
         || equalLettersIgnoringASCIICase(format, "woff2-variations")
index 9f92306..3d61d8b 100644 (file)
@@ -61,10 +61,9 @@ LegacyTileGridTile::LegacyTileGridTile(LegacyTileGrid* tileGrid, const IntRect&
         m_tileLayer = adoptNS([[LegacyTileLayer alloc] init]);
     }
     LegacyTileLayer* layer = m_tileLayer.get();
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
     if (screenSupportsExtendedColor())
         layer.contentsFormat = kCAContentsFormatRGBA10XR;
-#endif
+
     [layer setTileGrid:tileGrid];
     [layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];
     [layer setEdgeAntialiasingMask:0];
index 1618407..7a309a1 100644 (file)
@@ -71,11 +71,7 @@ bool screenHasInvertedColors()
 
 bool screenSupportsExtendedColor(Widget*)
 {
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
     return MGGetBoolAnswer(kMGQHasExtendedColorDisplay);
-#else
-    return false;
-#endif
 }
 
 // These functions scale between screen and page coordinates because JavaScript/DOM operations
index 588384b..151196a 100644 (file)
@@ -36,9 +36,7 @@
 SOFT_LINK_FRAMEWORK(MediaPlayer)
 SOFT_LINK_CLASS(MediaPlayer, MPRemoteCommandCenter)
 SOFT_LINK_CLASS(MediaPlayer, MPSeekCommandEvent)
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
 SOFT_LINK_CLASS(MediaPlayer, MPChangePlaybackPositionCommandEvent)
-#endif
 
 namespace WebCore {
 
@@ -114,7 +112,6 @@ RemoteCommandListenerIOS::RemoteCommandListenerIOS(RemoteCommandListenerClient&
         return MPRemoteCommandHandlerStatusSuccess;
     }];
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
     m_seekToTimeTarget = [[center changePlaybackPositionCommand] addTargetWithHandler:^(MPRemoteCommandEvent *event) {
         ASSERT([event isKindOfClass:getMPChangePlaybackPositionCommandEventClass()]);
 
@@ -132,7 +129,6 @@ RemoteCommandListenerIOS::RemoteCommandListenerIOS(RemoteCommandListenerClient&
 
         return MPRemoteCommandHandlerStatusSuccess;
     }];
-#endif
 }
 
 RemoteCommandListenerIOS::~RemoteCommandListenerIOS()
@@ -143,16 +139,12 @@ RemoteCommandListenerIOS::~RemoteCommandListenerIOS()
     [[center togglePlayPauseCommand] removeTarget:m_togglePlayPauseTarget.get()];
     [[center seekForwardCommand] removeTarget:m_seekForwardTarget.get()];
     [[center seekBackwardCommand] removeTarget:m_seekBackwardTarget.get()];
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
     [[center changePlaybackPositionCommand] removeTarget:m_seekToTimeTarget.get()];
-#endif
 }
 
 void RemoteCommandListenerIOS::updateSupportedCommands()
 {
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
     [[[getMPRemoteCommandCenterClass() sharedCommandCenter] changePlaybackPositionCommand] setEnabled:!!client().supportsSeeking()];
-#endif
 }
 
 }
index a0cbe04..f3c6bc9 100644 (file)
@@ -139,7 +139,7 @@ typedef void (^CFCachedURLResponseCallBackBlock)(CFCachedURLResponseRef);
 @end
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
 @interface NSHTTPCookie ()
 @property (nullable, readonly, copy) NSString *_storagePartition;
 @end
index 352dd64..0fc71c4 100644 (file)
@@ -188,7 +188,7 @@ CGDataProviderRef CGPDFDocumentGetDataProvider(CGPDFDocumentRef);
 CGFontAntialiasingStyle CGContextGetFontAntialiasingStyle(CGContextRef);
 void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
 typedef struct CGPDFAnnotation *CGPDFAnnotationRef;
 typedef bool (^CGPDFAnnotationDrawCallbackType)(CGContextRef context, CGPDFPageRef page, CGPDFAnnotationRef annotation);
 void CGContextDrawPDFPageWithAnnotations(CGContextRef, CGPDFPageRef, CGPDFAnnotationDrawCallbackType);
index 852d30b..51d908e 100644 (file)
@@ -36,9 +36,7 @@ typedef struct __DDResult *DDResultRef;
 #import <DataDetectorsCore/DataDetectorsCore.h>
 
 #if PLATFORM(IOS)
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 #import <DataDetectorsCore/DDOptionalSource.h>
-#endif
 #import <DataDetectorsCore/DDURLifier.h>
 #endif // PLATFORM(IOS)
 
index 6565c4f..a434b4b 100644 (file)
@@ -84,9 +84,6 @@
 @property BOOL hitTestsAsOpaque;
 @property BOOL needsLayoutOnGeometryChange;
 @property BOOL shadowPathIsBounds;
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300 && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
-@property (copy) NSString *contentsFormat;
-#endif
 @end
 
 #if PLATFORM(IOS)
@@ -205,7 +202,7 @@ extern NSString * const kCAContextDisplayName;
 extern NSString * const kCAContextDisplayId;
 extern NSString * const kCAContextIgnoresHitTest;
 
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS)
 extern NSString * const kCAContentsFormatRGBA10XR;
 #endif
 
@@ -213,10 +210,7 @@ extern NSString * const kCAContentsFormatRGBA10XR;
 extern NSString * const kCAContentsFormatRGBA8ColorRGBA8LinearGlyphMask;
 #endif
 
-#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000) \
-    || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
-    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
 @protocol CALayerDelegate <NSObject>
 @end
 
index ab8954f..4ac02de 100644 (file)
@@ -76,7 +76,7 @@ NS_ASSUME_NONNULL_END
 
 #endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || PLATFORM(IOS)
 #import <AVFoundation/AVAssetCache.h>
 #else
 @interface AVAssetCache : NSObject
index c46589f..da5d2a5 100644 (file)
@@ -1,3 +1,12 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-07-01  Ryosuke Niwa  <rniwa@webkit.org>
 
         Frame.h doesn't need to include FrameLoader.h, IntRect.h, and NavigationScheduler.h
index 9e56e68..2e496d3 100644 (file)
@@ -45,8 +45,6 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW
 ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 
 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
index 8db18d8..0edeea8 100644 (file)
@@ -1,3 +1,26 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * Configurations/WebKit.xcconfig:
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView dealloc]):
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKFormInputSession setSuggestions:]):
+        (-[WKFormInputSession invalidate]):
+        (-[WKContentView insertTextSuggestion:]):
+        (contentTypeFromFieldName):
+        (-[WKContentView textInputTraits]):
+        (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::getPositionInformation):
+        * config.h:
+
 2017-07-01  Brady Eidson  <beidson@apple.com>
 
         When setting a custom cookie storage location on a WKWebsiteDataStore, cookies aren't actually removed.
index 9e56e68..2e496d3 100644 (file)
@@ -45,8 +45,6 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW
 ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 
 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
index 16a187c..43f34ec 100644 (file)
@@ -78,9 +78,6 @@ WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=macosx*] = $(WK_FRAMEWORK_HEADER
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101100 = YES;
 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101200 = YES;
 
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos9*] = YES;
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator9*] = YES;
-
 WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
 WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
 
index e43b37c..4342828 100644 (file)
@@ -242,12 +242,6 @@ typedef enum {
 @property (nonatomic, readwrite, retain) UIResponder <UIKeyInput> *delegate;
 @end
 
-@interface UIGestureRecognizer ()
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90200
-@property(nonatomic, copy) NSArray<NSNumber *> *allowedTouchTypes;
-#endif
-@end
-
 @interface UILongPressGestureRecognizer ()
 @property (nonatomic) CFTimeInterval delay;
 @property (nonatomic, readonly) CGPoint startPoint;
@@ -299,16 +293,6 @@ typedef enum {
 - (CADisplay *)_display;
 @end
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100
-typedef enum {
-    UITouchTypeDirect
-} UITouchType;
-
-@interface UITouch ()
-@property(nonatomic,readonly) UITouchType type;
-@end
-#endif
-
 @interface UIScrollView ()
 - (void)_stopScrollingAndZoomingAnimations;
 - (void)_zoomToCenter:(CGPoint)center scale:(CGFloat)scale duration:(CFTimeInterval)duration force:(BOOL)force;
@@ -385,13 +369,11 @@ typedef enum {
 - (void)willStartScrollingOverflow;
 @end
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 @class UITextSuggestion;
 
 @protocol UITextInputSuggestionDelegate <UITextInputDelegate>
 - (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
 @end
-#endif
 
 @interface UIViewController ()
 + (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
@@ -569,11 +551,6 @@ typedef NS_ENUM(NSInteger, UIWKHandlePosition) {
 @property (nonatomic, assign) NSRange rangeInMarkedText;
 @end
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
-@protocol UIResponderStandardEditActions
-@end
-#endif
-
 @interface UIWKTextInteractionAssistant : UITextInteractionAssistant <UIResponderStandardEditActions>
 @end
 
@@ -926,9 +903,7 @@ extern const NSString *UIPreviewDataLink;
 extern const NSString *UIPreviewDataDDResult;
 extern const NSString *UIPreviewDataDDContext;
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 extern const NSString *UIPreviewDataAttachmentList;
 extern const NSString *UIPreviewDataAttachmentIndex;
-#endif
 
 WTF_EXTERN_C_END
index bec5778..d3bbb53 100644 (file)
 #import <WebCore/WebBackgroundTaskController.h>
 #import <WebCore/WebSQLiteDatabaseTrackerClient.h>
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 #if __has_include(<AccessibilitySupport.h>)
 #include <AccessibilitySupport.h>
 #else
@@ -151,7 +150,6 @@ extern "C" {
 CFStringRef kAXSAllowForceWebScalingEnabledNotification;
 }
 #endif
-#endif
 
 #define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(_page && _page->isAlwaysOnLoggingAllowed(), ViewState, __VA_ARGS__)
 
@@ -681,7 +679,7 @@ static uint32_t convertSystemLayoutDirection(NSUserInterfaceLayoutDirection dire
 
     [_remoteObjectRegistry _invalidate];
     [[_configuration _contentProviderRegistry] removePage:*_page];
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if PLATFORM(IOS)
     CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), nullptr, nullptr);
 #endif
     [[NSNotificationCenter defaultCenter] removeObserver:self];
index b6fdfbb..ae954f2 100644 (file)
@@ -394,19 +394,15 @@ const CGFloat minimumTapHighlightRadius = 2.0;
 
 - (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions
 {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
     _suggestions = adoptNS([suggestions copy]);
     [suggestionDelegate setSuggestions:suggestions];
-#endif
 }
 
 - (void)invalidate
 {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
     [suggestionDelegate setSuggestions:nil];
-#endif
     _contentView = nil;
 }
 
@@ -2979,14 +2975,12 @@ static void selectionChangedWithTouch(WKContentView *view, const WebCore::IntPoi
     [self.inputDelegate selectionDidChange:self];
 }
     
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 - (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion
 {
     id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
     if ([inputDelegate respondsToSelector:@selector(_webView:insertTextSuggestion:inInputSession:)])
         [inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()];
 }
-#endif
 
 - (NSString *)textInRange:(UITextRange *)range
 {
@@ -3202,7 +3196,6 @@ static UITextAutocapitalizationType toUITextAutocapitalize(AutocapitalizeType we
     return UITextAutocapitalizationTypeSentences;
 }
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName)
 {
     switch (fieldName) {
@@ -3285,7 +3278,6 @@ static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName)
 
     return nil;
 }
-#endif
 
 // UITextInputPrivate protocol
 // Direct access to the (private) UITextInputTraits object.
@@ -3328,9 +3320,7 @@ static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName)
         [_traits setKeyboardType:UIKeyboardTypeDefault];
     }
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     [_traits setTextContentType:contentTypeFromFieldName(_assistedNodeInformation.autofillFieldName)];
-#endif
 
     return _traits.get();
 }
@@ -5008,7 +4998,6 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
         *type = UIPreviewItemTypeImage;
         dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
     } else if (canShowAttachmentPreview) {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
         *type = UIPreviewItemTypeAttachment;
         auto element = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:(NSURL *)linkURL location:_positionInformation.request.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:nil]);
         NSUInteger index = [uiDelegate _webView:_webView indexIntoAttachmentListForElement:element.get()];
@@ -5023,7 +5012,6 @@ static NSArray<UIItemProvider *> *extractItemProvidersFromDropSession(id <UIDrop
             // FIXME: Replace the following NSString literal with a UIKit NSString constant.
             dataForPreview[@"UIPreviewDataAttachmentListSourceIsManaged"] = [NSNumber numberWithBool:sourceIsManaged];
         }
-#endif
     }
     
     return dataForPreview;
index e76f9b7..475ac86 100644 (file)
@@ -2535,9 +2535,7 @@ void WebPage::getPositionInformation(const InteractionInformationRequest& reques
                                     FloatSize bitmapSize = scaledSize.width() < image->size().width() ? scaledSize : image->size();
                                     // FIXME: Only select ExtendedColor on images known to need wide gamut
                                     ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
                                     flags |= screenSupportsExtendedColor() ? ShareableBitmap::SupportsExtendedColor : 0;
-#endif
                                     if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), flags)) {
                                         auto graphicsContext = sharedBitmap->createGraphicsContext();
                                         graphicsContext->drawImage(*image, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height()));
index 544ecd7..6ce7e9b 100644 (file)
 #endif
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) \
-    || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 100000) \
-    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 30000) \
-    || USE(SOUP)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) || USE(SOUP)
 #ifndef USE_NETWORK_SESSION
 #define USE_NETWORK_SESSION 1
 #endif
index b57295b..6541d34 100644 (file)
@@ -1,5 +1,16 @@
 2017-07-01  Dan Bernstein  <mitz@apple.com>
 
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * bmalloc/BPlatform.h:
+        * bmalloc/VMAllocate.h:
+        (bmalloc::vmPageSizePhysical):
+
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
         [macOS] Remove code only needed when building for OS X Yosemite
         https://bugs.webkit.org/show_bug.cgi?id=174067
 
index fe2e8ad..45bbc24 100644 (file)
 
 #define BATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
 
-#if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || BPLATFORM(IOS)
 #define BUSE_OS_LOG 1
 #endif
index 1b79f3b..819dc95 100644 (file)
@@ -87,7 +87,7 @@ inline void vmValidate(void* p, size_t vmSize)
 
 inline size_t vmPageSizePhysical()
 {
-#if (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if BPLATFORM(IOS)
     return vm_kernel_page_size;
 #else
     static size_t cached;
index 0284e74..df776e8 100644 (file)
@@ -1,3 +1,16 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+        (WTR::initializeWebViewConfiguration):
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        (-[HIDEventGenerator _createIOHIDEventType:]):
+
 2017-07-01  Brady Eidson  <beidson@apple.com>
 
         When setting a custom cookie storage location on a WKWebsiteDataStore, cookies aren't actually removed.
index 9e56e68..2e496d3 100644 (file)
@@ -45,8 +45,6 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING[sdk=iphone*] = ENABLE_ACCELERATED_OVERFLOW
 ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
 
 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
index 783111c..79798d1 100644 (file)
@@ -71,11 +71,11 @@ void initializeWebViewConfiguration(const char* libraryPath, WKStringRef injecte
     globalWebViewConfiguration.websiteDataStore = (WKWebsiteDataStore *)WKContextGetWebsiteDataStore(context);
     globalWebViewConfiguration._allowUniversalAccessFromFileURLs = YES;
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
     globalWebViewConfiguration._applePayEnabled = YES;
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
     WKCookieManagerSetCookieStoragePartitioningEnabled(WKContextGetCookieManager(context), true);
 #endif
 
index 7072678..1e7ee7a 100644 (file)
@@ -393,15 +393,9 @@ static InterpolationType interpolationFromString(NSString *string)
         RetainPtr<IOHIDEventRef> subEvent;
         if (pointInfo->isStylus) {
             if (eventType == StylusEventTouched) {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
                 eventMask |= kIOHIDDigitizerEventEstimatedAltitude;
                 eventMask |= kIOHIDDigitizerEventEstimatedAzimuth;
                 eventMask |= kIOHIDDigitizerEventEstimatedPressure;
-#else
-                eventMask |= kIOHIDDigitizerEventUpdateAltitudeMask;
-                eventMask |= kIOHIDDigitizerEventUpdateAzimuthMask;
-                eventMask |= kIOHIDDigitizerEventUpdatePressureMask;
-#endif
             } else if (eventType == StylusEventMoved)
                 eventMask = kIOHIDDigitizerEventPosition;
 
index cb32b30..f570d94 100644 (file)
@@ -1,3 +1,22 @@
+2017-07-01  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Remove code only needed when building for iOS 9.x
+        https://bugs.webkit.org/show_bug.cgi?id=174068
+
+        Reviewed by Tim Horton.
+
+        * WebKitPrivateFrameworkStubs/iOS/9: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework: Removed.
+        * WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd: Removed.
+
 2017-06-29  Jonathan Bedard  <jbedard@apple.com>
 
         Add WebKitSystemInterface for iOS 11
diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd
deleted file mode 100644 (file)
index ce1ce62..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
----
-archs: [ armv7, armv7s, arm64 ]
-platform: ios
-install-name: /System/Library/PrivateFrameworks/AppSupport.framework/AppSupport
-objc-constraint: none
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    symbols: [ _CPCopyBundleIdentifierFromAuditToken ]
-...
diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd
deleted file mode 100644 (file)
index be717cc..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
----
-archs: [ armv7, armv7s, arm64 ]
-platform: ios
-install-name: /System/Library/PrivateFrameworks/AssertionServices.framework/AssertionServices
-objc-constraint: none
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    symbols: [ _BKSApplicationStateMostElevatedStateForProcessIDKey, _BKSApplicationStateProcessIDKey ]
-    objc-classes: [ _BKSApplicationStateMonitor, _BKSProcessAssertion ]
-...
diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd
deleted file mode 100644 (file)
index fb4141a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
----
-archs: [ armv7, armv7s, arm64 ]
-platform: ios
-install-name: /System/Library/PrivateFrameworks/CorePDF.framework/CorePDF
-objc-constraint: none
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    objc-classes: [ _UIPDFDocument, _UIPDFLinkAnnotation, _UIPDFPageView, _UIPDFSelection ]
-...
diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd
deleted file mode 100644 (file)
index 0865871..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
----
-archs: [ armv7, armv7s, arm64 ]
-platform: ios
-install-name: /System/Library/PrivateFrameworks/GraphicsServices.framework/GraphicsServices
-objc-constraint: none
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    symbols: [ _GSCurrentEventTimestamp, _GSInitialize, _GSSystemRootDirectory ]
-...
diff --git a/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd b/WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd
deleted file mode 100644 (file)
index a93ef51..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
----
-archs: [ armv7, armv7s, arm64 ]
-platform: ios
-install-name: /System/Library/PrivateFrameworks/IOSurface.framework/IOSurface
-objc-constraint: none
-exports:
-  - archs: [ armv7, armv7s, arm64 ]
-    symbols: [
-               _IOSurfaceAcceleratorCreate,
-               _IOSurfaceAcceleratorGetRunLoopSource,
-               _IOSurfaceAcceleratorTransformSurface,
-               _IOSurfaceAlignProperty,
-               _IOSurfaceCreate,
-               _IOSurfaceCreateMachPort,
-               _IOSurfaceGetAllocSize,
-               _IOSurfaceGetBaseAddress,
-               _IOSurfaceGetBytesPerRow,
-               _IOSurfaceGetHeight,
-               _IOSurfaceGetPixelFormat,
-               _IOSurfaceGetPropertyMaximum,
-               _IOSurfaceGetWidth,
-               _IOSurfaceIsInUse,
-               _IOSurfaceLock,
-               _IOSurfaceLookupFromMachPort,
-               _IOSurfaceSetPurgeable,
-               _IOSurfaceUnlock,
-               _kIOSurfaceAllocSize,
-               _kIOSurfaceBytesPerElement,
-               _kIOSurfaceBytesPerRow,
-               _kIOSurfaceCacheMode,
-               _kIOSurfaceElementHeight,
-               _kIOSurfaceHeight,
-               _kIOSurfacePixelFormat,
-               _kIOSurfacePlaneBytesPerRow,
-               _kIOSurfacePlaneHeight,
-               _kIOSurfacePlaneInfo,
-               _kIOSurfacePlaneOffset,
-               _kIOSurfacePlaneSize,
-               _kIOSurfacePlaneWidth,
-               _kIOSurfaceWidth
-             ]
-...