Changeset 219055 in webkit
- Timestamp:
- Jul 1, 2017 7:06:40 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r219050 r219055 1 2017-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 1 13 2017-07-01 Dan Bernstein <mitz@apple.com> 2 14 -
trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
r219050 r219055 46 46 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 47 47 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;50 48 51 49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000); -
trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
r218868 r219055 42 42 #include "MacroAssembler.h" 43 43 44 #if PLATFORM( MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)44 #if PLATFORM(COCOA) 45 45 #define HAVE_REMAP_JIT 1 46 46 #endif 47 47 48 48 #if HAVE(REMAP_JIT) 49 #if CPU(ARM64) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 10000049 #if CPU(ARM64) && PLATFORM(IOS) 50 50 #define USE_EXECUTE_ONLY_JIT_WRITE_FUNCTION 1 51 51 #endif -
trunk/Source/JavaScriptCore/runtime/Options.cpp
r218883 r219055 459 459 } 460 460 461 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000461 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) 462 462 // Override globally for now. Longer term we'll just make the default 463 463 // be to have this option enabled, and have platforms that don't support -
trunk/Source/WTF/ChangeLog
r219053 r219055 1 2017-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 1 12 2017-07-01 Caio Lima <ticaiolima@gmail.com> 2 13 -
trunk/Source/WTF/wtf/Platform.h
r219050 r219055 584 584 #if PLATFORM(IOS) 585 585 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 1591 #endif592 593 586 #define HAVE_NETWORK_EXTENSION 1 594 587 #define HAVE_READLINE 1 … … 678 671 #endif /* OS(DARWIN) */ 679 672 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) 681 674 #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1 682 675 #endif … … 1197 1190 1198 1191 /* 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)) 1200 1193 #define USE_OS_LOG 1 1201 1194 #if USE(APPLE_INTERNAL_SDK) … … 1204 1197 #endif 1205 1198 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) 1207 1200 #define HAVE_SEC_TRUST_SERIALIZATION 1 1208 1201 #endif -
trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm
r201406 r219055 39 39 namespace WTF { 40 40 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 42 42 WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context); 43 43 WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context); -
trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h
r212256 r219055 29 29 30 30 #include <mach-o/dyld_priv.h> 31 32 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 10000033 #define DYLD_IOS_VERSION_10_0 0x000A000034 #endif35 31 36 32 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 -
trunk/Source/WebCore/ChangeLog
r219054 r219055 1 2017-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 1 59 2017-07-01 Myles C. Maxfield <mmaxfield@apple.com> 2 60 -
trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig
r219050 r219055 46 46 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 47 47 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;50 48 51 49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000); -
trunk/Source/WebCore/PAL/ChangeLog
r219050 r219055 1 2017-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 1 10 2017-07-01 Dan Bernstein <mitz@apple.com> 2 11 -
trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
r219050 r219055 46 46 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 47 47 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;50 48 51 49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000); -
trunk/Source/WebCore/editing/cocoa/DataDetection.mm
r217774 r219055 158 158 return false; 159 159 160 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000161 160 return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().toStringWithoutCopying().convertToASCIILowercase()]; 162 #else163 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 #endif168 161 } 169 162 … … 180 173 bool DataDetection::shouldCancelDefaultAction(Element& element) 181 174 { 182 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000183 175 if (!isDataDetectorLink(element)) 184 176 return false; … … 202 194 } 203 195 return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result); 204 #else205 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 #endif214 196 } 215 197 … … 235 217 || ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo)) 236 218 || ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo)) 237 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000238 219 || ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(get_DataDetectorsCore_DDBinderParsecSourceKey(), type, 0) == kCFCompareEqualTo)) 239 #endif240 220 || ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category)) 241 221 || ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) { … … 439 419 buildQuery(scanQuery.get(), contextRange.get()); 440 420 441 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000442 421 if (types & DataDetectorTypeLookupSuggestion) 443 422 softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true); 444 #endif 445 423 446 424 // FIXME: we should add a timeout to this call to make sure it doesn't take too much time. 447 425 if (!softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), scanQuery.get())) … … 570 548 571 549 lastModifiedQueryOffset = queryRange.end; 572 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000573 550 BOOL shouldUseLightLinks = softLink_DataDetectorsCore_DDShouldUseLightLinksForResult(coreResult, [indexPaths[resultIndex] length] > 1); 574 #else575 BOOL shouldUseLightLinks = NO;576 #endif577 551 578 552 for (auto& range : resultRanges) { -
trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm
r215340 r219055 40 40 size_t vmPageSize() 41 41 { 42 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 10000042 #if PLATFORM(IOS) 43 43 return vm_kernel_page_size; 44 44 #else -
trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h
r217580 r219055 50 50 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result)) 51 51 SOFT_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 >= 10000053 52 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ()) 54 53 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url)) … … 56 55 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature)) 57 56 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef) 58 #endif59 57 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef) 60 58 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef) … … 68 66 SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions) 69 67 70 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 10000071 68 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable)) 72 #endif73 69 74 70 #endif // PLATFORM(IOS) -
trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm
r217580 r219055 48 48 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result)) 49 49 SOFT_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 >= 10000051 50 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ()) 52 51 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url)) … … 54 53 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature)) 55 54 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef) 56 #endif57 55 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef) 58 56 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef) … … 66 64 SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions) 67 65 68 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 10000069 66 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable)) 70 #endif71 67 72 68 #endif // PLATFORM(IOS) && ENABLE(DATA_DETECTION) -
trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp
r206830 r219055 57 57 } 58 58 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)) 60 60 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode) 61 61 : FontPlatformData(size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode) -
trunk/Source/WebCore/platform/graphics/FontPlatformData.h
r218799 r219055 87 87 static FontPlatformData cloneWithSize(const FontPlatformData&, float); 88 88 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)) 90 90 FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant, TextRenderingMode); 91 91 #endif … … 139 139 bool hasVariations() const { return m_hasVariations; } 140 140 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)) 142 142 CGFontRef cgFont() const { return m_cgFont.get(); } 143 143 #endif … … 228 228 #endif 229 229 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)) 231 231 RetainPtr<CGFontRef> m_cgFont; 232 232 #endif -
trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
r217696 r219055 1010 1010 } 1011 1011 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) 1013 1013 static NSString *layerContentsFormat(bool acceleratesDrawing, bool wantsDeepColor, bool supportsSubpixelAntialiasedFonts) 1014 1014 { 1015 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 903001015 #if PLATFORM(IOS) 1016 1016 if (wantsDeepColor) 1017 1017 return kCAContentsFormatRGBA10XR; … … 1036 1036 if (m_layerType == LayerTypeWebLayer || m_layerType == LayerTypeTiledBackingTileLayer) { 1037 1037 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) 1039 1039 if (NSString *formatString = layerContentsFormat(acceleratesDrawing(), wantsDeepColorBackingStore(), supportsSubpixelAntialiasedText())) 1040 1040 [m_layer setContentsFormat:formatString]; … … 1210 1210 unsigned PlatformCALayerCocoa::backingStoreBytesPerPixel() const 1211 1211 { 1212 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 903001212 #if PLATFORM(IOS) 1213 1213 if (wantsDeepColorBackingStore()) 1214 1214 return isOpaque() ? 4 : 5; -
trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
r208596 r219055 98 98 { 99 99 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) 101 101 extendedSRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB); 102 102 #endif -
trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp
r219045 r219055 352 352 #else 353 353 // 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) 355 355 CGContextDrawPDFPageWithAnnotations(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1), nullptr); 356 356 #else -
trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r219050 r219055 1281 1281 1282 1282 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) 1284 1284 if (!locale.isNull()) 1285 1285 localeString = locale.string().createCFString(); … … 1290 1290 CFIndex coveredLength = 0; 1291 1291 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)) 1293 1293 result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength)); 1294 1294 #else -
trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm
r219050 r219055 238 238 bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantCaps, UChar32 character) const 239 239 { 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) 241 241 Glyph glyph = glyphForCharacter(character); 242 242 if (!glyph) … … 280 280 } 281 281 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) 283 283 static RetainPtr<CFDictionaryRef> smallCapsOpenTypeDictionary(CFStringRef key, int rawValue) 284 284 { … … 585 585 } 586 586 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)) 588 588 static inline std::optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph) 589 589 { … … 615 615 CGFontRenderingStyle style = kCGFontRenderingStyleAntialiasing | kCGFontRenderingStyleSubpixelPositioning | kCGFontRenderingStyleSubpixelQuantization | kCGFontAntialiasingStyleUnfiltered; 616 616 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) 618 618 if (platformData().size()) { 619 619 CTFontOrientation orientation = horizontal || m_isBrokenIdeographFallback ? kCTFontOrientationHorizontal : kCTFontOrientationVertical; -
trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm
r215686 r219055 41 41 42 42 FontPlatformData::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 44 44 : FontPlatformData(adoptCF(CTFontCopyGraphicsFont(font, NULL)).get(), size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode) 45 45 #else … … 163 163 164 164 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 166 166 ASSERT(m_cgFont); 167 167 #endif -
trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm
r219050 r219055 254 254 RetainPtr<CGImageRef> WebCore::IOSurface::sinkIntoImage(std::unique_ptr<IOSurface> surface) 255 255 { 256 #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || PLATFORM(MAC)257 256 return adoptCF(CGIOSurfaceContextCreateImageReference(surface->ensurePlatformContext())); 258 #else259 return surface->createImage();260 #endif261 257 } 262 258 -
trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm
r218081 r219055 78 78 automaticDequeue(); 79 79 }); 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) 81 81 dispatch_activate(m_timerSource.get()); 82 82 #endif -
trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
r219054 r219055 96 96 } 97 97 98 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 10000099 98 static RetainPtr<NSDictionary> systemFontModificationAttributes(FontSelectionValue weight, bool italic) 100 99 { … … 129 128 return @{ static_cast<NSString *>(kCTFontTraitsAttribute) : traitsDictionary.get() }; 130 129 } 131 #endif132 130 133 131 static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontSelectionValue weight, bool bold, bool italic, float size) 134 132 { 135 133 RetainPtr<CTFontDescriptorRef> fontDescriptor = baseSystemFontDescriptor(weight, bold, size); 136 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000137 134 RetainPtr<NSDictionary> attributes = systemFontModificationAttributes(weight, italic); 138 135 return adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), static_cast<CFDictionaryRef>(attributes.get()))); 139 #else140 if (italic)141 return adoptCF(CTFontDescriptorCreateCopyWithSymbolicTraits(fontDescriptor.get(), kCTFontItalicTrait, kCTFontItalicTrait));142 return fontDescriptor;143 #endif144 136 } 145 137 -
trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp
r217762 r219055 61 61 return equalLettersIgnoringASCIICase(format, "truetype") 62 62 || 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) 64 64 || equalLettersIgnoringASCIICase(format, "woff2") 65 65 #if ENABLE(VARIATION_FONTS) -
trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm
r212439 r219055 62 62 } 63 63 LegacyTileLayer* layer = m_tileLayer.get(); 64 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 9030065 64 if (screenSupportsExtendedColor()) 66 65 layer.contentsFormat = kCAContentsFormatRGBA10XR; 67 #endif 66 68 67 [layer setTileGrid:tileGrid]; 69 68 [layer setOpaque:m_tileGrid->tileCache().tilesOpaque()]; -
trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm
r207774 r219055 72 72 bool screenSupportsExtendedColor(Widget*) 73 73 { 74 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 9030075 74 return MGGetBoolAnswer(kMGQHasExtendedColorDisplay); 76 #else77 return false;78 #endif79 75 } 80 76 -
trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm
r204082 r219055 37 37 SOFT_LINK_CLASS(MediaPlayer, MPRemoteCommandCenter) 38 38 SOFT_LINK_CLASS(MediaPlayer, MPSeekCommandEvent) 39 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 9010040 39 SOFT_LINK_CLASS(MediaPlayer, MPChangePlaybackPositionCommandEvent) 41 #endif42 40 43 41 namespace WebCore { … … 115 113 }]; 116 114 117 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100118 115 m_seekToTimeTarget = [[center changePlaybackPositionCommand] addTargetWithHandler:^(MPRemoteCommandEvent *event) { 119 116 ASSERT([event isKindOfClass:getMPChangePlaybackPositionCommandEventClass()]); … … 133 130 return MPRemoteCommandHandlerStatusSuccess; 134 131 }]; 135 #endif136 132 } 137 133 … … 144 140 [[center seekForwardCommand] removeTarget:m_seekForwardTarget.get()]; 145 141 [[center seekBackwardCommand] removeTarget:m_seekBackwardTarget.get()]; 146 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100147 142 [[center changePlaybackPositionCommand] removeTarget:m_seekToTimeTarget.get()]; 148 #endif149 143 } 150 144 151 145 void RemoteCommandListenerIOS::updateSupportedCommands() 152 146 { 153 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100154 147 [[[getMPRemoteCommandCenterClass() sharedCommandCenter] changePlaybackPositionCommand] setEnabled:!!client().supportsSeeking()]; 155 #endif156 148 } 157 149 -
trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
r219050 r219055 140 140 #endif 141 141 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) 143 143 @interface NSHTTPCookie () 144 144 @property (nullable, readonly, copy) NSString *_storagePartition; -
trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h
r219050 r219055 189 189 void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle); 190 190 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) 192 192 typedef struct CGPDFAnnotation *CGPDFAnnotationRef; 193 193 typedef bool (^CGPDFAnnotationDrawCallbackType)(CGContextRef context, CGPDFPageRef page, CGPDFAnnotationRef annotation); -
trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h
r217580 r219055 37 37 38 38 #if PLATFORM(IOS) 39 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 10000040 39 #import <DataDetectorsCore/DDOptionalSource.h> 41 #endif42 40 #import <DataDetectorsCore/DDURLifier.h> 43 41 #endif // PLATFORM(IOS) -
trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
r219050 r219055 85 85 @property BOOL needsLayoutOnGeometryChange; 86 86 @property BOOL shadowPathIsBounds; 87 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300 && __IPHONE_OS_VERSION_MAX_ALLOWED < 10000088 @property (copy) NSString *contentsFormat;89 #endif90 87 @end 91 88 … … 206 203 extern NSString * const kCAContextIgnoresHitTest; 207 204 208 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300205 #if PLATFORM(IOS) 209 206 extern NSString * const kCAContentsFormatRGBA10XR; 210 207 #endif … … 214 211 #endif 215 212 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 220 214 @protocol CALayerDelegate <NSObject> 221 215 @end -
trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h
r218043 r219055 77 77 #endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS) 78 78 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) 80 80 #import <AVFoundation/AVAssetCache.h> 81 81 #else -
trunk/Source/WebKit/mac/ChangeLog
r219051 r219055 1 2017-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 1 10 2017-07-01 Ryosuke Niwa <rniwa@webkit.org> 2 11 -
trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
r219050 r219055 46 46 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 47 47 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;50 48 51 49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000); -
trunk/Source/WebKit2/ChangeLog
r219052 r219055 1 2017-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 1 24 2017-07-01 Brady Eidson <beidson@apple.com> 2 25 -
trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig
r219050 r219055 46 46 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 47 47 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;50 48 51 49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000); -
trunk/Source/WebKit2/Configurations/WebKit.xcconfig
r219050 r219055 79 79 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101200 = YES; 80 80 81 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos9*] = YES;82 WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator9*] = YES;83 84 81 WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS)); 85 82 WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache; -
trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h
r219029 r219055 243 243 @end 244 244 245 @interface UIGestureRecognizer ()246 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 90200247 @property(nonatomic, copy) NSArray<NSNumber *> *allowedTouchTypes;248 #endif249 @end250 251 245 @interface UILongPressGestureRecognizer () 252 246 @property (nonatomic) CFTimeInterval delay; … … 299 293 - (CADisplay *)_display; 300 294 @end 301 302 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100303 typedef enum {304 UITouchTypeDirect305 } UITouchType;306 307 @interface UITouch ()308 @property(nonatomic,readonly) UITouchType type;309 @end310 #endif311 295 312 296 @interface UIScrollView () … … 386 370 @end 387 371 388 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000389 372 @class UITextSuggestion; 390 373 … … 392 375 - (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions; 393 376 @end 394 #endif395 377 396 378 @interface UIViewController () … … 570 552 @end 571 553 572 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 100000573 @protocol UIResponderStandardEditActions574 @end575 #endif576 577 554 @interface UIWKTextInteractionAssistant : UITextInteractionAssistant <UIResponderStandardEditActions> 578 555 @end … … 927 904 extern const NSString *UIPreviewDataDDContext; 928 905 929 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000930 906 extern const NSString *UIPreviewDataAttachmentList; 931 907 extern const NSString *UIPreviewDataAttachmentIndex; 932 #endif933 908 934 909 WTF_EXTERN_C_END -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r219034 r219055 144 144 #import <WebCore/WebSQLiteDatabaseTrackerClient.h> 145 145 146 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000147 146 #if __has_include(<AccessibilitySupport.h>) 148 147 #include <AccessibilitySupport.h> … … 151 150 CFStringRef kAXSAllowForceWebScalingEnabledNotification; 152 151 } 153 #endif154 152 #endif 155 153 … … 682 680 [_remoteObjectRegistry _invalidate]; 683 681 [[_configuration _contentProviderRegistry] removePage:*_page]; 684 #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000682 #if PLATFORM(IOS) 685 683 CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), nullptr, nullptr); 686 684 #endif -
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
r218924 r219055 395 395 - (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions 396 396 { 397 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000398 397 id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate; 399 398 _suggestions = adoptNS([suggestions copy]); 400 399 [suggestionDelegate setSuggestions:suggestions]; 401 #endif402 400 } 403 401 404 402 - (void)invalidate 405 403 { 406 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000407 404 id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate; 408 405 [suggestionDelegate setSuggestions:nil]; 409 #endif410 406 _contentView = nil; 411 407 } … … 2980 2976 } 2981 2977 2982 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 1000002983 2978 - (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion 2984 2979 { … … 2987 2982 [inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()]; 2988 2983 } 2989 #endif2990 2984 2991 2985 - (NSString *)textInRange:(UITextRange *)range … … 3203 3197 } 3204 3198 3205 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 1000003206 3199 static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName) 3207 3200 { … … 3286 3279 return nil; 3287 3280 } 3288 #endif3289 3281 3290 3282 // UITextInputPrivate protocol … … 3329 3321 } 3330 3322 3331 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 1000003332 3323 [_traits setTextContentType:contentTypeFromFieldName(_assistedNodeInformation.autofillFieldName)]; 3333 #endif3334 3324 3335 3325 return _traits.get(); … … 5009 4999 dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL; 5010 5000 } else if (canShowAttachmentPreview) { 5011 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 1000005012 5001 *type = UIPreviewItemTypeAttachment; 5013 5002 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]); … … 5024 5013 dataForPreview[@"UIPreviewDataAttachmentListSourceIsManaged"] = [NSNumber numberWithBool:sourceIsManaged]; 5025 5014 } 5026 #endif5027 5015 } 5028 5016 -
trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
r218985 r219055 2536 2536 // FIXME: Only select ExtendedColor on images known to need wide gamut 2537 2537 ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha; 2538 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 1000002539 2538 flags |= screenSupportsExtendedColor() ? ShareableBitmap::SupportsExtendedColor : 0; 2540 #endif2541 2539 if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), flags)) { 2542 2540 auto graphicsContext = sharedBitmap->createGraphicsContext(); -
trunk/Source/WebKit2/config.h
r218843 r219055 74 74 #endif 75 75 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) 81 77 #ifndef USE_NETWORK_SESSION 82 78 #define USE_NETWORK_SESSION 1 -
trunk/Source/bmalloc/ChangeLog
r219050 r219055 1 2017-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 1 12 2017-07-01 Dan Bernstein <mitz@apple.com> 2 13 -
trunk/Source/bmalloc/bmalloc/BPlatform.h
r216763 r219055 195 195 #define BATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments))) 196 196 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) 198 198 #define BUSE_OS_LOG 1 199 199 #endif -
trunk/Source/bmalloc/bmalloc/VMAllocate.h
r200035 r219055 88 88 inline size_t vmPageSizePhysical() 89 89 { 90 #if (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)90 #if BPLATFORM(IOS) 91 91 return vm_kernel_page_size; 92 92 #else -
trunk/Tools/ChangeLog
r219052 r219055 1 2017-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 1 14 2017-07-01 Brady Eidson <beidson@apple.com> 2 15 -
trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
r219050 r219055 46 46 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY; 47 47 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY; 48 ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;49 ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;50 48 51 49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000); -
trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm
r219049 r219055 72 72 globalWebViewConfiguration._allowUniversalAccessFromFileURLs = YES; 73 73 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) 75 75 globalWebViewConfiguration._applePayEnabled = YES; 76 76 #endif 77 77 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) 79 79 WKCookieManagerSetCookieStoragePartitioningEnabled(WKContextGetCookieManager(context), true); 80 80 #endif -
trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm
r218275 r219055 394 394 if (pointInfo->isStylus) { 395 395 if (eventType == StylusEventTouched) { 396 #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000397 396 eventMask |= kIOHIDDigitizerEventEstimatedAltitude; 398 397 eventMask |= kIOHIDDigitizerEventEstimatedAzimuth; 399 398 eventMask |= kIOHIDDigitizerEventEstimatedPressure; 400 #else401 eventMask |= kIOHIDDigitizerEventUpdateAltitudeMask;402 eventMask |= kIOHIDDigitizerEventUpdateAzimuthMask;403 eventMask |= kIOHIDDigitizerEventUpdatePressureMask;404 #endif405 399 } else if (eventType == StylusEventMoved) 406 400 eventMask = kIOHIDDigitizerEventPosition; -
trunk/WebKitLibraries/ChangeLog
r218952 r219055 1 2017-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 1 20 2017-06-29 Jonathan Bedard <jbedard@apple.com> 2 21
Note: See TracChangeset
for help on using the changeset viewer.