Changeset 219055 in webkit


Ignore:
Timestamp:
Jul 1, 2017, 7:06:40 PM (8 years ago)
Author:
mitz@apple.com
Message:

[iOS] Remove code only needed when building for iOS 9.x
​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.
Location:
trunk
Files:
1 deleted
54 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r219050 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * jit/ExecutableAllocator.cpp:
     10        * runtime/Options.cpp:
     11        (JSC::recomputeDependentOptions):
     12
    1132017-07-01  Dan Bernstein  <mitz@apple.com>
    214

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r219050 r219055  
    4646ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4747ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    5048
    5149DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);

  • trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp

    r218868 r219055  
    4242#include "MacroAssembler.h"
    4343
    44 #if PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     44#if PLATFORM(COCOA)
    4545#define HAVE_REMAP_JIT 1
    4646#endif
    4747
    4848#if HAVE(REMAP_JIT)
    49 #if CPU(ARM64) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     49#if CPU(ARM64) && PLATFORM(IOS)
    5050#define USE_EXECUTE_ONLY_JIT_WRITE_FUNCTION 1
    5151#endif

  • trunk/Source/JavaScriptCore/runtime/Options.cpp

    r218883 r219055  
    459459    }
    460460   
    461 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     461#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
    462462    // Override globally for now. Longer term we'll just make the default
    463463    // be to have this option enabled, and have platforms that don't support

  • trunk/Source/WTF/ChangeLog

    r219053 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * wtf/Platform.h:
     9        * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
     10        * wtf/spi/darwin/dyldSPI.h:
     11
    1122017-07-01  Caio Lima  <ticaiolima@gmail.com>
    213

  • trunk/Source/WTF/wtf/Platform.h

    r219050 r219055  
    584584#if PLATFORM(IOS)
    585585
    586 #if USE(APPLE_INTERNAL_SDK) \
    587     && ((TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
    588      || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
    589      || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000))
    590 #define USE_CFURLCONNECTION 1
    591 #endif
    592 
    593586#define HAVE_NETWORK_EXTENSION 1
    594587#define HAVE_READLINE 1
    … …  
    678671#endif /* OS(DARWIN) */
    679672
    680 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     673#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    681674#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
    682675#endif
    … …  
    11971190
    11981191/* FIXME: Enable USE_OS_LOG when building with the public iOS 10 SDK once we fix <rdar://problem/27758343>. */
    1199 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 && USE(APPLE_INTERNAL_SDK))
     1192#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK))
    12001193#define USE_OS_LOG 1
    12011194#if USE(APPLE_INTERNAL_SDK)
    … …  
    12041197#endif
    12051198
    1206 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     1199#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    12071200#define HAVE_SEC_TRUST_SERIALIZATION 1
    12081201#endif

  • trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm

    r201406 r219055  
    3939namespace WTF {
    4040
    41 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
     41#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    4242WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context);
    4343WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context);

  • trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h

    r212256 r219055  
    2929
    3030#include <mach-o/dyld_priv.h>
    31 
    32 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000
    33 #define DYLD_IOS_VERSION_10_0 0x000A0000
    34 #endif
    3531
    3632#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200

  • trunk/Source/WebCore/ChangeLog

    r219054 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * editing/cocoa/DataDetection.mm:
     10        (WebCore::DataDetection::isDataDetectorLink):
     11        (WebCore::DataDetection::shouldCancelDefaultAction):
     12        (WebCore::constructURLStringForResult):
     13        (WebCore::DataDetection::detectContentInRange):
     14        * page/cocoa/ResourceUsageThreadCocoa.mm:
     15        (WebCore::vmPageSize):
     16        * platform/cocoa/DataDetectorsCoreSoftLink.h:
     17        * platform/cocoa/DataDetectorsCoreSoftLink.mm:
     18        * platform/graphics/FontPlatformData.cpp:
     19        * platform/graphics/FontPlatformData.h:
     20        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
     21        (layerContentsFormat):
     22        (PlatformCALayerCocoa::updateContentsFormat):
     23        (PlatformCALayerCocoa::backingStoreBytesPerPixel):
     24        * platform/graphics/cg/GraphicsContextCG.cpp:
     25        (WebCore::extendedSRGBColorSpaceRef):
     26        * platform/graphics/cg/PDFDocumentImage.cpp:
     27        (WebCore::PDFDocumentImage::drawPDFPage):
     28        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     29        (WebCore::lookupFallbackFont):
     30        * platform/graphics/cocoa/FontCocoa.mm:
     31        (WebCore::Font::variantCapsSupportsCharacterForSynthesis):
     32        (WebCore::Font::platformWidthForGlyph):
     33        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
     34        (WebCore::FontPlatformData::FontPlatformData):
     35        (WebCore::FontPlatformData::ctFont):
     36        * platform/graphics/cocoa/IOSurface.mm:
     37        (WebCore::IOSurface::sinkIntoImage):
     38        * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
     39        (WebCore::WebCoreDecompressionSession::setTimebase):
     40        * platform/graphics/ios/FontCacheIOS.mm:
     41        (WebCore::systemFontModificationAttributes):
     42        (WebCore::systemFontDescriptor):
     43        * platform/graphics/mac/FontCustomPlatformData.cpp:
     44        (WebCore::FontCustomPlatformData::supportsFormat):
     45        * platform/ios/LegacyTileGridTile.mm:
     46        (WebCore::LegacyTileGridTile::LegacyTileGridTile):
     47        * platform/ios/PlatformScreenIOS.mm:
     48        (WebCore::screenSupportsExtendedColor):
     49        * platform/ios/RemoteCommandListenerIOS.mm:
     50        (WebCore::RemoteCommandListenerIOS::RemoteCommandListenerIOS):
     51        (WebCore::RemoteCommandListenerIOS::~RemoteCommandListenerIOS):
     52        (WebCore::RemoteCommandListenerIOS::updateSupportedCommands):
     53        * platform/spi/cf/CFNetworkSPI.h:
     54        * platform/spi/cg/CoreGraphicsSPI.h:
     55        * platform/spi/cocoa/DataDetectorsCoreSPI.h:
     56        * platform/spi/cocoa/QuartzCoreSPI.h:
     57        * platform/spi/mac/AVFoundationSPI.h:
     58
    1592017-07-01  Myles C. Maxfield  <mmaxfield@apple.com>
    260

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r219050 r219055  
    4646ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4747ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    5048
    5149DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);

  • trunk/Source/WebCore/PAL/ChangeLog

    r219050 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102017-07-01  Dan Bernstein  <mitz@apple.com>
    211

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r219050 r219055  
    4646ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4747ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    5048
    5149DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);

  • trunk/Source/WebCore/editing/cocoa/DataDetection.mm

    r217774 r219055  
    158158        return false;
    159159
    160 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    161160    return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().toStringWithoutCopying().convertToASCIILowercase()];
    162 #else
    163     if (equalIgnoringASCIICase(element.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
    164         return true;
    165     URL url = downcast<HTMLAnchorElement>(element).href();
    166     return url.protocolIs("mailto") || url.protocolIs("tel");
    167 #endif
    168161}
    169162
    … …  
    180173bool DataDetection::shouldCancelDefaultAction(Element& element)
    181174{
    182 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    183175    if (!isDataDetectorLink(element))
    184176        return false;
    … …  
    202194    }
    203195    return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result);
    204 #else
    205     if (!is<HTMLAnchorElement>(element))
    206         return false;
    207     if (!equalLettersIgnoringASCIICase(element.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
    208         return false;
    209     auto& type = element.attributeWithoutSynchronization(x_apple_data_detectors_typeAttr);
    210     if (equalLettersIgnoringASCIICase(type, "misc") || equalLettersIgnoringASCIICase(type, "calendar-event") || equalLettersIgnoringASCIICase(type, "telephone"))
    211         return true;
    212     return false;
    213 #endif
    214196}
    215197
    … …  
    235217        || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
    236218        || ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
    237 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    238219        || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(get_DataDetectorsCore_DDBinderParsecSourceKey(), type, 0) == kCFCompareEqualTo))
    239 #endif
    240220        || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
    241221        || ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
    … …  
    439419    buildQuery(scanQuery.get(), contextRange.get());
    440420   
    441 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    442421    if (types & DataDetectorTypeLookupSuggestion)
    443422        softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
    444 #endif
    445    
     423
    446424    // FIXME: we should add a timeout to this call to make sure it doesn't take too much time.
    447425    if (!softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), scanQuery.get()))
    … …  
    570548       
    571549        lastModifiedQueryOffset = queryRange.end;
    572 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    573550        BOOL shouldUseLightLinks = softLink_DataDetectorsCore_DDShouldUseLightLinksForResult(coreResult, [indexPaths[resultIndex] length] > 1);
    574 #else
    575         BOOL shouldUseLightLinks = NO;
    576 #endif
    577551
    578552        for (auto& range : resultRanges) {

  • trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm

    r215340 r219055  
    4040size_t vmPageSize()
    4141{
    42 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     42#if PLATFORM(IOS)
    4343    return vm_kernel_page_size;
    4444#else

  • trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h

    r217580 r219055  
    5050SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
    5151SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
    52 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    5352SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
    5453SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
    … …  
    5655SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
    5756SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
    58 #endif
    5957SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
    6058SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
    … …  
    6866SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
    6967
    70 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    7168SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
    72 #endif
    7369
    7470#endif // PLATFORM(IOS)

  • trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm

    r217580 r219055  
    4848SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
    4949SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
    50 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    5150SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
    5251SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
    … …  
    5453SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
    5554SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
    56 #endif
    5755SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
    5856SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
    … …  
    6664SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
    6765
    68 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    6966SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
    70 #endif
    7167
    7268#endif // PLATFORM(IOS) && ENABLE(DATA_DETECTION)

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp

    r206830 r219055  
    5757}
    5858
    59 #if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
     59#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
    6060FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
    6161    : FontPlatformData(size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)

  • trunk/Source/WebCore/platform/graphics/FontPlatformData.h

    r218799 r219055  
    8787    static FontPlatformData cloneWithSize(const FontPlatformData&, float);
    8888
    89 #if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
     89#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
    9090    FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant, TextRenderingMode);
    9191#endif
    … …  
    139139    bool hasVariations() const { return m_hasVariations; }
    140140
    141 #if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
     141#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
    142142    CGFontRef cgFont() const { return m_cgFont.get(); }
    143143#endif
    … …  
    228228#endif
    229229
    230 #if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
     230#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
    231231    RetainPtr<CGFontRef> m_cgFont;
    232232#endif

  • trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

    r217696 r219055  
    10101010}
    10111011
    1012 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     1012#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    10131013static NSString *layerContentsFormat(bool acceleratesDrawing, bool wantsDeepColor, bool supportsSubpixelAntialiasedFonts)
    10141014{
    1015 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
     1015#if PLATFORM(IOS)
    10161016    if (wantsDeepColor)
    10171017        return kCAContentsFormatRGBA10XR;
    … …  
    10361036    if (m_layerType == LayerTypeWebLayer || m_layerType == LayerTypeTiledBackingTileLayer) {
    10371037        BEGIN_BLOCK_OBJC_EXCEPTIONS
    1038 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     1038#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    10391039        if (NSString *formatString = layerContentsFormat(acceleratesDrawing(), wantsDeepColorBackingStore(), supportsSubpixelAntialiasedText()))
    10401040            [m_layer setContentsFormat:formatString];
    … …  
    12101210unsigned PlatformCALayerCocoa::backingStoreBytesPerPixel() const
    12111211{
    1212 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
     1212#if PLATFORM(IOS)
    12131213    if (wantsDeepColorBackingStore())
    12141214        return isOpaque() ? 4 : 5;

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

    r208596 r219055  
    9898{
    9999    static CGColorSpaceRef extendedSRGBSpace;
    100 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     100#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    101101    extendedSRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
    102102#endif

  • trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp

    r219045 r219055  
    352352#else
    353353    // CGPDF pages are indexed from 1.
    354 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     354#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    355355    CGContextDrawPDFPageWithAnnotations(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1), nullptr);
    356356#else

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r219050 r219055  
    12811281
    12821282    RetainPtr<CFStringRef> localeString;
    1283 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     1283#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    12841284    if (!locale.isNull())
    12851285        localeString = locale.string().createCFString();
    … …  
    12901290    CFIndex coveredLength = 0;
    12911291    RetainPtr<CTFontRef> result;
    1292 #if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
     1292#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
    12931293    result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
    12941294#else

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm

    r219050 r219055  
    238238bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantCaps, UChar32 character) const
    239239{
    240 #if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     240#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    241241    Glyph glyph = glyphForCharacter(character);
    242242    if (!glyph)
    … …  
    280280}
    281281
    282 #if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     282#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    283283static RetainPtr<CFDictionaryRef> smallCapsOpenTypeDictionary(CFStringRef key, int rawValue)
    284284{
    … …  
    585585}
    586586
    587 #if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
     587#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
    588588static inline std::optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
    589589{
    … …  
    615615    CGFontRenderingStyle style = kCGFontRenderingStyleAntialiasing | kCGFontRenderingStyleSubpixelPositioning | kCGFontRenderingStyleSubpixelQuantization | kCGFontAntialiasingStyleUnfiltered;
    616616
    617 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     617#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    618618    if (platformData().size()) {
    619619        CTFontOrientation orientation = horizontal || m_isBrokenIdeographFallback ? kCTFontOrientationHorizontal : kCTFontOrientationVertical;

  • trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm

    r215686 r219055  
    4141
    4242FontPlatformData::FontPlatformData(CTFontRef font, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
    43 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
     43#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    4444    : FontPlatformData(adoptCF(CTFontCopyGraphicsFont(font, NULL)).get(), size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
    4545#else
    … …  
    163163
    164164    ASSERT(m_font);
    165 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
     165#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
    166166    ASSERT(m_cgFont);
    167167#endif

  • trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm

    r219050 r219055  
    254254RetainPtr<CGImageRef> WebCore::IOSurface::sinkIntoImage(std::unique_ptr<IOSurface> surface)
    255255{
    256 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || PLATFORM(MAC)
    257256    return adoptCF(CGIOSurfaceContextCreateImageReference(surface->ensurePlatformContext()));
    258 #else
    259     return surface->createImage();
    260 #endif
    261257}
    262258

  • trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm

    r218081 r219055  
    7878                automaticDequeue();
    7979            });
    80 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     80#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    8181            dispatch_activate(m_timerSource.get());
    8282#endif

  • trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm

    r219054 r219055  
    9696}
    9797
    98 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    9998static RetainPtr<NSDictionary> systemFontModificationAttributes(FontSelectionValue weight, bool italic)
    10099{
    … …  
    129128    return @{ static_cast<NSString *>(kCTFontTraitsAttribute) : traitsDictionary.get() };
    130129}
    131 #endif
    132130
    133131static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontSelectionValue weight, bool bold, bool italic, float size)
    134132{
    135133    RetainPtr<CTFontDescriptorRef> fontDescriptor = baseSystemFontDescriptor(weight, bold, size);
    136 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    137134    RetainPtr<NSDictionary> attributes = systemFontModificationAttributes(weight, italic);
    138135    return adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), static_cast<CFDictionaryRef>(attributes.get())));
    139 #else
    140     if (italic)
    141         return adoptCF(CTFontDescriptorCreateCopyWithSymbolicTraits(fontDescriptor.get(), kCTFontItalicTrait, kCTFontItalicTrait));
    142     return fontDescriptor;
    143 #endif
    144136}
    145137

  • trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp

    r217762 r219055  
    6161    return equalLettersIgnoringASCIICase(format, "truetype")
    6262        || equalLettersIgnoringASCIICase(format, "opentype")
    63 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
     63#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
    6464        || equalLettersIgnoringASCIICase(format, "woff2")
    6565#if ENABLE(VARIATION_FONTS)

  • trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm

    r212439 r219055  
    6262    }
    6363    LegacyTileLayer* layer = m_tileLayer.get();
    64 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
    6564    if (screenSupportsExtendedColor())
    6665        layer.contentsFormat = kCAContentsFormatRGBA10XR;
    67 #endif
     66
    6867    [layer setTileGrid:tileGrid];
    6968    [layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];

  • trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm

    r207774 r219055  
    7272bool screenSupportsExtendedColor(Widget*)
    7373{
    74 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
    7574    return MGGetBoolAnswer(kMGQHasExtendedColorDisplay);
    76 #else
    77     return false;
    78 #endif
    7975}
    8076

  • trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm

    r204082 r219055  
    3737SOFT_LINK_CLASS(MediaPlayer, MPRemoteCommandCenter)
    3838SOFT_LINK_CLASS(MediaPlayer, MPSeekCommandEvent)
    39 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
    4039SOFT_LINK_CLASS(MediaPlayer, MPChangePlaybackPositionCommandEvent)
    41 #endif
    4240
    4341namespace WebCore {
    … …  
    115113    }];
    116114
    117 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
    118115    m_seekToTimeTarget = [[center changePlaybackPositionCommand] addTargetWithHandler:^(MPRemoteCommandEvent *event) {
    119116        ASSERT([event isKindOfClass:getMPChangePlaybackPositionCommandEventClass()]);
    … …  
    133130        return MPRemoteCommandHandlerStatusSuccess;
    134131    }];
    135 #endif
    136132}
    137133
    … …  
    144140    [[center seekForwardCommand] removeTarget:m_seekForwardTarget.get()];
    145141    [[center seekBackwardCommand] removeTarget:m_seekBackwardTarget.get()];
    146 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
    147142    [[center changePlaybackPositionCommand] removeTarget:m_seekToTimeTarget.get()];
    148 #endif
    149143}
    150144
    151145void RemoteCommandListenerIOS::updateSupportedCommands()
    152146{
    153 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
    154147    [[[getMPRemoteCommandCenterClass() sharedCommandCenter] changePlaybackPositionCommand] setEnabled:!!client().supportsSeeking()];
    155 #endif
    156148}
    157149

  • trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h

    r219050 r219055  
    140140#endif
    141141
    142 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     142#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    143143@interface NSHTTPCookie ()
    144144@property (nullable, readonly, copy) NSString *_storagePartition;

  • trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h

    r219050 r219055  
    189189void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
    190190
    191 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     191#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    192192typedef struct CGPDFAnnotation *CGPDFAnnotationRef;
    193193typedef bool (^CGPDFAnnotationDrawCallbackType)(CGContextRef context, CGPDFPageRef page, CGPDFAnnotationRef annotation);

  • trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h

    r217580 r219055  
    3737
    3838#if PLATFORM(IOS)
    39 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    4039#import <DataDetectorsCore/DDOptionalSource.h>
    41 #endif
    4240#import <DataDetectorsCore/DDURLifier.h>
    4341#endif // PLATFORM(IOS)

  • trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

    r219050 r219055  
    8585@property BOOL needsLayoutOnGeometryChange;
    8686@property BOOL shadowPathIsBounds;
    87 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300 && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
    88 @property (copy) NSString *contentsFormat;
    89 #endif
    9087@end
    9188
    … …  
    206203extern NSString * const kCAContextIgnoresHitTest;
    207204
    208 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
     205#if PLATFORM(IOS)
    209206extern NSString * const kCAContentsFormatRGBA10XR;
    210207#endif
    … …  
    214211#endif
    215212
    216 #if (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
    217     || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000) \
    218     || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
    219     || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
     213#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
    220214@protocol CALayerDelegate <NSObject>
    221215@end

  • trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h

    r218043 r219055  
    7777#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
    7878
    79 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000)
     79#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || PLATFORM(IOS)
    8080#import <AVFoundation/AVAssetCache.h>
    8181#else

  • trunk/Source/WebKit/mac/ChangeLog

    r219051 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102017-07-01  Ryosuke Niwa  <rniwa@webkit.org>
    211

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r219050 r219055  
    4646ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4747ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    5048
    5149DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);

  • trunk/Source/WebKit2/ChangeLog

    r219052 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9        * Configurations/WebKit.xcconfig:
     10        * Platform/spi/ios/UIKitSPI.h:
     11        * UIProcess/API/Cocoa/WKWebView.mm:
     12        (-[WKWebView dealloc]):
     13        * UIProcess/ios/WKContentViewInteraction.mm:
     14        (-[WKFormInputSession setSuggestions:]):
     15        (-[WKFormInputSession invalidate]):
     16        (-[WKContentView insertTextSuggestion:]):
     17        (contentTypeFromFieldName):
     18        (-[WKContentView textInputTraits]):
     19        (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
     20        * WebProcess/WebPage/ios/WebPageIOS.mm:
     21        (WebKit::WebPage::getPositionInformation):
     22        * config.h:
     23
    1242017-07-01  Brady Eidson  <beidson@apple.com>
    225

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r219050 r219055  
    4646ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4747ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    5048
    5149DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r219050 r219055  
    7979WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101200 = YES;
    8080
    81 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos9*] = YES;
    82 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator9*] = YES;
    83 
    8481WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
    8582WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;

  • trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

    r219029 r219055  
    243243@end
    244244
    245 @interface UIGestureRecognizer ()
    246 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 90200
    247 @property(nonatomic, copy) NSArray<NSNumber *> *allowedTouchTypes;
    248 #endif
    249 @end
    250 
    251245@interface UILongPressGestureRecognizer ()
    252246@property (nonatomic) CFTimeInterval delay;
    … …  
    299293- (CADisplay *)_display;
    300294@end
    301 
    302 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100
    303 typedef enum {
    304     UITouchTypeDirect
    305 } UITouchType;
    306 
    307 @interface UITouch ()
    308 @property(nonatomic,readonly) UITouchType type;
    309 @end
    310 #endif
    311295
    312296@interface UIScrollView ()
    … …  
    386370@end
    387371
    388 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    389372@class UITextSuggestion;
    390373
    … …  
    392375- (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
    393376@end
    394 #endif
    395377
    396378@interface UIViewController ()
    … …  
    570552@end
    571553
    572 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
    573 @protocol UIResponderStandardEditActions
    574 @end
    575 #endif
    576 
    577554@interface UIWKTextInteractionAssistant : UITextInteractionAssistant <UIResponderStandardEditActions>
    578555@end
    … …  
    927904extern const NSString *UIPreviewDataDDContext;
    928905
    929 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    930906extern const NSString *UIPreviewDataAttachmentList;
    931907extern const NSString *UIPreviewDataAttachmentIndex;
    932 #endif
    933908
    934909WTF_EXTERN_C_END

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r219034 r219055  
    144144#import <WebCore/WebSQLiteDatabaseTrackerClient.h>
    145145
    146 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    147146#if __has_include(<AccessibilitySupport.h>)
    148147#include <AccessibilitySupport.h>
    … …  
    151150CFStringRef kAXSAllowForceWebScalingEnabledNotification;
    152151}
    153 #endif
    154152#endif
    155153
    … …  
    682680    [_remoteObjectRegistry _invalidate];
    683681    [[_configuration _contentProviderRegistry] removePage:*_page];
    684 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     682#if PLATFORM(IOS)
    685683    CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), nullptr, nullptr);
    686684#endif

  • trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

    r218924 r219055  
    395395- (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions
    396396{
    397 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    398397    id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
    399398    _suggestions = adoptNS([suggestions copy]);
    400399    [suggestionDelegate setSuggestions:suggestions];
    401 #endif
    402400}
    403401
    404402- (void)invalidate
    405403{
    406 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    407404    id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
    408405    [suggestionDelegate setSuggestions:nil];
    409 #endif
    410406    _contentView = nil;
    411407}
    … …  
    29802976}
    29812977   
    2982 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    29832978- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion
    29842979{
    … …  
    29872982        [inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()];
    29882983}
    2989 #endif
    29902984
    29912985- (NSString *)textInRange:(UITextRange *)range
    … …  
    32033197}
    32043198
    3205 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    32063199static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName)
    32073200{
    … …  
    32863279    return nil;
    32873280}
    3288 #endif
    32893281
    32903282// UITextInputPrivate protocol
    … …  
    33293321    }
    33303322
    3331 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    33323323    [_traits setTextContentType:contentTypeFromFieldName(_assistedNodeInformation.autofillFieldName)];
    3333 #endif
    33343324
    33353325    return _traits.get();
    … …  
    50094999        dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
    50105000    } else if (canShowAttachmentPreview) {
    5011 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    50125001        *type = UIPreviewItemTypeAttachment;
    50135002        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]);
    … …  
    50245013            dataForPreview[@"UIPreviewDataAttachmentListSourceIsManaged"] = [NSNumber numberWithBool:sourceIsManaged];
    50255014        }
    5026 #endif
    50275015    }
    50285016   

  • trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

    r218985 r219055  
    25362536                                    // FIXME: Only select ExtendedColor on images known to need wide gamut
    25372537                                    ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
    2538 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    25392538                                    flags |= screenSupportsExtendedColor() ? ShareableBitmap::SupportsExtendedColor : 0;
    2540 #endif
    25412539                                    if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), flags)) {
    25422540                                        auto graphicsContext = sharedBitmap->createGraphicsContext();

  • trunk/Source/WebKit2/config.h

    r218843 r219055  
    7474#endif
    7575
    76 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) \
    77     || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) \
    78     || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 100000) \
    79     || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 30000) \
    80     || USE(SOUP)
     76#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) || USE(SOUP)
    8177#ifndef USE_NETWORK_SESSION
    8278#define USE_NETWORK_SESSION 1

  • trunk/Source/bmalloc/ChangeLog

    r219050 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * bmalloc/BPlatform.h:
     9        * bmalloc/VMAllocate.h:
     10        (bmalloc::vmPageSizePhysical):
     11
    1122017-07-01  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/Source/bmalloc/bmalloc/BPlatform.h

    r216763 r219055  
    195195#define BATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
    196196
    197 #if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     197#if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || BPLATFORM(IOS)
    198198#define BUSE_OS_LOG 1
    199199#endif

  • trunk/Source/bmalloc/bmalloc/VMAllocate.h

    r200035 r219055  
    8888inline size_t vmPageSizePhysical()
    8989{
    90 #if (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     90#if BPLATFORM(IOS)
    9191    return vm_kernel_page_size;
    9292#else

  • trunk/Tools/ChangeLog

    r219052 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     9        * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
     10        (WTR::initializeWebViewConfiguration):
     11        * WebKitTestRunner/ios/HIDEventGenerator.mm:
     12        (-[HIDEventGenerator _createIOHIDEventType:]):
     13
    1142017-07-01  Brady Eidson  <beidson@apple.com>
    215

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r219050 r219055  
    4646ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4747ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
    49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
    5048
    5149DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);

  • trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

    r219049 r219055  
    7272    globalWebViewConfiguration._allowUniversalAccessFromFileURLs = YES;
    7373
    74 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     74#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
    7575    globalWebViewConfiguration._applePayEnabled = YES;
    7676#endif
    7777
    78 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
     78#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
    7979    WKCookieManagerSetCookieStoragePartitioningEnabled(WKContextGetCookieManager(context), true);
    8080#endif

  • trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm

    r218275 r219055  
    394394        if (pointInfo->isStylus) {
    395395            if (eventType == StylusEventTouched) {
    396 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
    397396                eventMask |= kIOHIDDigitizerEventEstimatedAltitude;
    398397                eventMask |= kIOHIDDigitizerEventEstimatedAzimuth;
    399398                eventMask |= kIOHIDDigitizerEventEstimatedPressure;
    400 #else
    401                 eventMask |= kIOHIDDigitizerEventUpdateAltitudeMask;
    402                 eventMask |= kIOHIDDigitizerEventUpdateAzimuthMask;
    403                 eventMask |= kIOHIDDigitizerEventUpdatePressureMask;
    404 #endif
    405399            } else if (eventType == StylusEventMoved)
    406400                eventMask = kIOHIDDigitizerEventPosition;

  • trunk/WebKitLibraries/ChangeLog

    r218952 r219055  
     12017-07-01  Dan Bernstein  <mitz@apple.com>
     2
     3        [iOS] Remove code only needed when building for iOS 9.x
     4        https://bugs.webkit.org/show_bug.cgi?id=174068
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebKitPrivateFrameworkStubs/iOS/9: Removed.
     9        * WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework: Removed.
     10        * WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd: Removed.
     11        * WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework: Removed.
     12        * WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd: Removed.
     13        * WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework: Removed.
     14        * WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd: Removed.
     15        * WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework: Removed.
     16        * WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd: Removed.
     17        * WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework: Removed.
     18        * WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd: Removed.
     19
    1202017-06-29  Jonathan Bedard  <jbedard@apple.com>
    221
Note: See TracChangeset for help on using the changeset viewer.