Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (219054 => 219055)
--- trunk/Source/_javascript_Core/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,5 +1,17 @@
2017-07-01 Dan Bernstein <[email protected]>
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * jit/ExecutableAllocator.cpp:
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+
+2017-07-01 Dan Bernstein <[email protected]>
+
[macOS] Remove code only needed when building for OS X Yosemite
https://bugs.webkit.org/show_bug.cgi?id=174067
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (219054 => 219055)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -45,8 +45,6 @@
ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocator.cpp (219054 => 219055)
--- trunk/Source/_javascript_Core/jit/ExecutableAllocator.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocator.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -41,12 +41,12 @@
#include "LinkBuffer.h"
#include "MacroAssembler.h"
-#if PLATFORM(MAC) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if PLATFORM(COCOA)
#define HAVE_REMAP_JIT 1
#endif
#if HAVE(REMAP_JIT)
-#if CPU(ARM64) && PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if CPU(ARM64) && PLATFORM(IOS)
#define USE_EXECUTE_ONLY_JIT_WRITE_FUNCTION 1
#endif
#endif
Modified: trunk/Source/_javascript_Core/runtime/Options.cpp (219054 => 219055)
--- trunk/Source/_javascript_Core/runtime/Options.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/_javascript_Core/runtime/Options.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -458,7 +458,7 @@
Options::useOSREntryToFTL() = false;
}
-#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
// Override globally for now. Longer term we'll just make the default
// be to have this option enabled, and have platforms that don't support
// it just silently use a single mapping.
Modified: trunk/Source/WTF/ChangeLog (219054 => 219055)
--- trunk/Source/WTF/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WTF/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,3 +1,14 @@
+2017-07-01 Dan Bernstein <[email protected]>
+
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * wtf/Platform.h:
+ * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
+ * wtf/spi/darwin/dyldSPI.h:
+
2017-07-01 Caio Lima <[email protected]>
[JSC] WTFGetBacktrace can return numberOfFrames == 0 in some architectures
Modified: trunk/Source/WTF/wtf/Platform.h (219054 => 219055)
--- trunk/Source/WTF/wtf/Platform.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WTF/wtf/Platform.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -583,13 +583,6 @@
#if PLATFORM(IOS)
-#if USE(APPLE_INTERNAL_SDK) \
- && ((TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
- || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
- || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000))
-#define USE_CFURLCONNECTION 1
-#endif
-
#define HAVE_NETWORK_EXTENSION 1
#define HAVE_READLINE 1
#define USE_UIKIT_EDITING 1
@@ -677,7 +670,7 @@
#endif /* OS(DARWIN) */
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
#define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
#endif
@@ -1196,7 +1189,7 @@
#endif
/* FIXME: Enable USE_OS_LOG when building with the public iOS 10 SDK once we fix <rdar://problem/27758343>. */
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000 && USE(APPLE_INTERNAL_SDK))
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && USE(APPLE_INTERNAL_SDK))
#define USE_OS_LOG 1
#if USE(APPLE_INTERNAL_SDK)
#define USE_OS_STATE 1
@@ -1203,7 +1196,7 @@
#endif
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
#define HAVE_SEC_TRUST_SERIALIZATION 1
#endif
Modified: trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm (219054 => 219055)
--- trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -38,7 +38,7 @@
namespace WTF {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context);
WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context);
Modified: trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h (219054 => 219055)
--- trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -29,10 +29,6 @@
#include <mach-o/dyld_priv.h>
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000
-#define DYLD_IOS_VERSION_10_0 0x000A0000
-#endif
-
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
#define DYLD_MACOSX_VERSION_10_12 0x000A0C00
#endif
Modified: trunk/Source/WebCore/ChangeLog (219054 => 219055)
--- trunk/Source/WebCore/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,3 +1,61 @@
+2017-07-01 Dan Bernstein <[email protected]>
+
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::DataDetection::isDataDetectorLink):
+ (WebCore::DataDetection::shouldCancelDefaultAction):
+ (WebCore::constructURLStringForResult):
+ (WebCore::DataDetection::detectContentInRange):
+ * page/cocoa/ResourceUsageThreadCocoa.mm:
+ (WebCore::vmPageSize):
+ * platform/cocoa/DataDetectorsCoreSoftLink.h:
+ * platform/cocoa/DataDetectorsCoreSoftLink.mm:
+ * platform/graphics/FontPlatformData.cpp:
+ * platform/graphics/FontPlatformData.h:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (layerContentsFormat):
+ (PlatformCALayerCocoa::updateContentsFormat):
+ (PlatformCALayerCocoa::backingStoreBytesPerPixel):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::extendedSRGBColorSpaceRef):
+ * platform/graphics/cg/PDFDocumentImage.cpp:
+ (WebCore::PDFDocumentImage::drawPDFPage):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::lookupFallbackFont):
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::variantCapsSupportsCharacterForSynthesis):
+ (WebCore::Font::platformWidthForGlyph):
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::ctFont):
+ * platform/graphics/cocoa/IOSurface.mm:
+ (WebCore::IOSurface::sinkIntoImage):
+ * platform/graphics/cocoa/WebCoreDecompressionSession.mm:
+ (WebCore::WebCoreDecompressionSession::setTimebase):
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::systemFontModificationAttributes):
+ (WebCore::systemFontDescriptor):
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::supportsFormat):
+ * platform/ios/LegacyTileGridTile.mm:
+ (WebCore::LegacyTileGridTile::LegacyTileGridTile):
+ * platform/ios/PlatformScreenIOS.mm:
+ (WebCore::screenSupportsExtendedColor):
+ * platform/ios/RemoteCommandListenerIOS.mm:
+ (WebCore::RemoteCommandListenerIOS::RemoteCommandListenerIOS):
+ (WebCore::RemoteCommandListenerIOS::~RemoteCommandListenerIOS):
+ (WebCore::RemoteCommandListenerIOS::updateSupportedCommands):
+ * platform/spi/cf/CFNetworkSPI.h:
+ * platform/spi/cg/CoreGraphicsSPI.h:
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h:
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ * platform/spi/mac/AVFoundationSPI.h:
+
2017-07-01 Myles C. Maxfield <[email protected]>
REGRESSION(r218371): Reeder's default font is Times instead of San Francisco
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (219054 => 219055)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -45,8 +45,6 @@
ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
Modified: trunk/Source/WebCore/PAL/ChangeLog (219054 => 219055)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,5 +1,14 @@
2017-07-01 Dan Bernstein <[email protected]>
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2017-07-01 Dan Bernstein <[email protected]>
+
[macOS] Remove code only needed when building for OS X Yosemite
https://bugs.webkit.org/show_bug.cgi?id=174067
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (219054 => 219055)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -45,8 +45,6 @@
ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (219054 => 219055)
--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -157,14 +157,7 @@
if (!is<HTMLAnchorElement>(element))
return false;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().toStringWithoutCopying().convertToASCIILowercase()];
-#else
- if (equalIgnoringASCIICase(element.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
- return true;
- URL url = ""
- return url.protocolIs("mailto") || url.protocolIs("tel");
-#endif
}
bool DataDetection::requiresExtendedContext(Element& element)
@@ -179,7 +172,6 @@
bool DataDetection::shouldCancelDefaultAction(Element& element)
{
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
if (!isDataDetectorLink(element))
return false;
@@ -201,16 +193,6 @@
result = (DDResultRef)[results objectAtIndex:resultIndices[i].toInt()];
}
return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result);
-#else
- if (!is<HTMLAnchorElement>(element))
- return false;
- if (!equalLettersIgnoringASCIICase(element.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
- return false;
- auto& type = element.attributeWithoutSynchronization(x_apple_data_detectors_typeAttr);
- if (equalLettersIgnoringASCIICase(type, "misc") || equalLettersIgnoringASCIICase(type, "calendar-event") || equalLettersIgnoringASCIICase(type, "telephone"))
- return true;
- return false;
-#endif
}
static BOOL resultIsURL(DDResultRef result)
@@ -234,9 +216,7 @@
if (((detectionTypes & DataDetectorTypeAddress) && (DDResultCategoryAddress == category))
|| ((detectionTypes & DataDetectorTypeTrackingNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderTrackingNumberKey(), type, 0) == kCFCompareEqualTo))
|| ((detectionTypes & DataDetectorTypeFlightNumber) && (CFStringCompare(get_DataDetectorsCore_DDBinderFlightInformationKey(), type, 0) == kCFCompareEqualTo))
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
|| ((detectionTypes & DataDetectorTypeLookupSuggestion) && (CFStringCompare(get_DataDetectorsCore_DDBinderParsecSourceKey(), type, 0) == kCFCompareEqualTo))
-#endif
|| ((detectionTypes & DataDetectorTypePhoneNumber) && (DDResultCategoryPhoneNumber == category))
|| ((detectionTypes & DataDetectorTypeLink) && resultIsURL(currentResult))) {
@@ -438,11 +418,9 @@
RetainPtr<DDScanQueryRef> scanQuery = adoptCF(softLink_DataDetectorsCore_DDScanQueryCreate(NULL));
buildQuery(scanQuery.get(), contextRange.get());
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
if (types & DataDetectorTypeLookupSuggestion)
softLink_DataDetectorsCore_DDScannerEnableOptionalSource(scanner.get(), DDScannerSourceSpotlight, true);
-#endif
-
+
// FIXME: we should add a timeout to this call to make sure it doesn't take too much time.
if (!softLink_DataDetectorsCore_DDScannerScanQuery(scanner.get(), scanQuery.get()))
return nil;
@@ -569,11 +547,7 @@
}
lastModifiedQueryOffset = queryRange.end;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
BOOL shouldUseLightLinks = softLink_DataDetectorsCore_DDShouldUseLightLinksForResult(coreResult, [indexPaths[resultIndex] length] > 1);
-#else
- BOOL shouldUseLightLinks = NO;
-#endif
for (auto& range : resultRanges) {
auto* parentNode = range->startContainer().parentNode();
Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm (219054 => 219055)
--- trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -39,7 +39,7 @@
size_t vmPageSize()
{
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if PLATFORM(IOS)
return vm_kernel_page_size;
#else
static size_t cached = sysconf(_SC_PAGESIZE);
Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h (219054 => 219055)
--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -49,13 +49,11 @@
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetSubResults, CFArrayRef, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
-#endif
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderMailURLKey, CFStringRef)
@@ -67,9 +65,7 @@
SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDURLScheme, NSString *)
SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
-#endif
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -47,13 +47,11 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetSubResults, CFArrayRef, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderParsecSourceKey, CFStringRef)
-#endif
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderMailURLKey, CFStringRef)
@@ -65,8 +63,6 @@
SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLScheme, NSString *)
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerCopyResultsOptionsForPassiveUse, DDScannerCopyResultsOptions)
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDScannerEnableOptionalSource, void, (DDScannerRef scanner, DDScannerSource source, Boolean enable), (scanner, source, enable))
-#endif
#endif // PLATFORM(IOS) && ENABLE(DATA_DETECTION)
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -56,7 +56,7 @@
{
}
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
: FontPlatformData(size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
{
Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -86,7 +86,7 @@
static FontPlatformData cloneWithSyntheticOblique(const FontPlatformData&, bool);
static FontPlatformData cloneWithSize(const FontPlatformData&, float);
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant, TextRenderingMode);
#endif
@@ -138,7 +138,7 @@
bool hasVariations() const { return m_hasVariations; }
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
CGFontRef cgFont() const { return m_cgFont.get(); }
#endif
@@ -227,7 +227,7 @@
RefPtr<SharedGDIObject<HFONT>> m_font;
#endif
-#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000))
+#if USE(CG) && (PLATFORM(WIN) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200))
RetainPtr<CGFontRef> m_cgFont;
#endif
Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1009,10 +1009,10 @@
#endif
}
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
static NSString *layerContentsFormat(bool acceleratesDrawing, bool wantsDeepColor, bool supportsSubpixelAntialiasedFonts)
{
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS)
if (wantsDeepColor)
return kCAContentsFormatRGBA10XR;
#else
@@ -1035,7 +1035,7 @@
{
if (m_layerType == LayerTypeWebLayer || m_layerType == LayerTypeTiledBackingTileLayer) {
BEGIN_BLOCK_OBJC_EXCEPTIONS
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
if (NSString *formatString = layerContentsFormat(acceleratesDrawing(), wantsDeepColorBackingStore(), supportsSubpixelAntialiasedText()))
[m_layer setContentsFormat:formatString];
#endif
@@ -1209,7 +1209,7 @@
unsigned PlatformCALayerCocoa::backingStoreBytesPerPixel() const
{
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS)
if (wantsDeepColorBackingStore())
return isOpaque() ? 4 : 5;
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -97,7 +97,7 @@
CGColorSpaceRef extendedSRGBColorSpaceRef()
{
static CGColorSpaceRef extendedSRGBSpace;
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
extendedSRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
#endif
// If there is no support for exteneded sRGB, fall back to sRGB.
Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -351,7 +351,7 @@
notImplemented();
#else
// CGPDF pages are indexed from 1.
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
CGContextDrawPDFPageWithAnnotations(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1), nullptr);
#else
CGContextDrawPDFPage(context.platformContext(), CGPDFDocumentGetPage(m_document.get(), 1));
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1280,7 +1280,7 @@
ASSERT(length > 0);
RetainPtr<CFStringRef> localeString;
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
if (!locale.isNull())
localeString = locale.string().createCFString();
#else
@@ -1289,7 +1289,7 @@
CFIndex coveredLength = 0;
RetainPtr<CTFontRef> result;
-#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
+#if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
#else
result = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -237,7 +237,7 @@
bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantCaps, UChar32 character) const
{
-#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
Glyph glyph = glyphForCharacter(character);
if (!glyph)
return false;
@@ -279,7 +279,7 @@
#endif
}
-#if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if (PLATFORM(IOS) && TARGET_OS_IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
static RetainPtr<CFDictionaryRef> smallCapsOpenTypeDictionary(CFStringRef key, int rawValue)
{
RetainPtr<CFNumberRef> value = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawValue));
@@ -584,7 +584,7 @@
return boundingBox;
}
-#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000))
+#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS))
static inline std::optional<CGSize> advanceForColorBitmapFont(const FontPlatformData& platformData, Glyph glyph)
{
CTFontRef font = platformData.font();
@@ -614,7 +614,7 @@
bool horizontal = platformData().orientation() == Horizontal;
CGFontRenderingStyle style = kCGFontRenderingStyleAntialiasing | kCGFontRenderingStyleSubpixelPositioning | kCGFontRenderingStyleSubpixelQuantization | kCGFontAntialiasingStyleUnfiltered;
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
if (platformData().size()) {
CTFontOrientation orientation = horizontal || m_isBrokenIdeographFallback ? kCTFontOrientationHorizontal : kCTFontOrientationVertical;
// FIXME: Remove this special-casing when <rdar://problem/28197291> and <rdar://problem/28662086> are fixed.
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -40,7 +40,7 @@
enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidth, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth };
FontPlatformData::FontPlatformData(CTFontRef font, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant, TextRenderingMode textRenderingMode)
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
: FontPlatformData(adoptCF(CTFontCopyGraphicsFont(font, NULL)).get(), size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
#else
: FontPlatformData(size, syntheticBold, syntheticOblique, orientation, widthVariant, textRenderingMode)
@@ -162,7 +162,7 @@
return m_ctFont.get();
ASSERT(m_font);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
ASSERT(m_cgFont);
#endif
m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_font.get(), m_size, 0, cascadeToLastResortAndVariationsFontDescriptor(m_font.get()).get()));
Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -253,11 +253,7 @@
RetainPtr<CGImageRef> WebCore::IOSurface::sinkIntoImage(std::unique_ptr<IOSurface> surface)
{
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || PLATFORM(MAC)
return adoptCF(CGIOSurfaceContextCreateImageReference(surface->ensurePlatformContext()));
-#else
- return surface->createImage();
-#endif
}
void WebCore::IOSurface::setContextSize(IntSize contextSize)
Modified: trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -77,7 +77,7 @@
dispatch_source_set_event_handler(m_timerSource.get(), [this] {
automaticDequeue();
});
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
dispatch_activate(m_timerSource.get());
#endif
}
Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -95,7 +95,6 @@
return adoptCF(CTFontDescriptorCreateForUIType(fontType, size, nullptr));
}
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
static RetainPtr<NSDictionary> systemFontModificationAttributes(FontSelectionValue weight, bool italic)
{
RetainPtr<NSMutableDictionary> traitsDictionary = adoptNS([[NSMutableDictionary alloc] init]);
@@ -128,19 +127,12 @@
return @{ static_cast<NSString *>(kCTFontTraitsAttribute) : traitsDictionary.get() };
}
-#endif
static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontSelectionValue weight, bool bold, bool italic, float size)
{
RetainPtr<CTFontDescriptorRef> fontDescriptor = baseSystemFontDescriptor(weight, bold, size);
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
RetainPtr<NSDictionary> attributes = systemFontModificationAttributes(weight, italic);
return adoptCF(CTFontDescriptorCreateCopyWithAttributes(fontDescriptor.get(), static_cast<CFDictionaryRef>(attributes.get())));
-#else
- if (italic)
- return adoptCF(CTFontDescriptorCreateCopyWithSymbolicTraits(fontDescriptor.get(), kCTFontItalicTrait, kCTFontItalicTrait));
- return fontDescriptor;
-#endif
}
RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest request, float size)
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (219054 => 219055)
--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2017-07-02 02:06:40 UTC (rev 219055)
@@ -60,7 +60,7 @@
{
return equalLettersIgnoringASCIICase(format, "truetype")
|| equalLettersIgnoringASCIICase(format, "opentype")
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
+#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
|| equalLettersIgnoringASCIICase(format, "woff2")
#if ENABLE(VARIATION_FONTS)
|| equalLettersIgnoringASCIICase(format, "woff2-variations")
Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -61,10 +61,9 @@
m_tileLayer = adoptNS([[LegacyTileLayer alloc] init]);
}
LegacyTileLayer* layer = m_tileLayer.get();
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
if (screenSupportsExtendedColor())
layer.contentsFormat = kCAContentsFormatRGBA10XR;
-#endif
+
[layer setTileGrid:tileGrid];
[layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];
[layer setEdgeAntialiasingMask:0];
Modified: trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -71,11 +71,7 @@
bool screenSupportsExtendedColor(Widget*)
{
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
return MGGetBoolAnswer(kMGQHasExtendedColorDisplay);
-#else
- return false;
-#endif
}
// These functions scale between screen and page coordinates because _javascript_/DOM operations
Modified: trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm (219054 => 219055)
--- trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/ios/RemoteCommandListenerIOS.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -36,9 +36,7 @@
SOFT_LINK_FRAMEWORK(MediaPlayer)
SOFT_LINK_CLASS(MediaPlayer, MPRemoteCommandCenter)
SOFT_LINK_CLASS(MediaPlayer, MPSeekCommandEvent)
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
SOFT_LINK_CLASS(MediaPlayer, MPChangePlaybackPositionCommandEvent)
-#endif
namespace WebCore {
@@ -114,7 +112,6 @@
return MPRemoteCommandHandlerStatusSuccess;
}];
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
m_seekToTimeTarget = [[center changePlaybackPositionCommand] addTargetWithHandler:^(MPRemoteCommandEvent *event) {
ASSERT([event isKindOfClass:getMPChangePlaybackPositionCommandEventClass()]);
@@ -132,7 +129,6 @@
return MPRemoteCommandHandlerStatusSuccess;
}];
-#endif
}
RemoteCommandListenerIOS::~RemoteCommandListenerIOS()
@@ -143,16 +139,12 @@
[[center togglePlayPauseCommand] removeTarget:m_togglePlayPauseTarget.get()];
[[center seekForwardCommand] removeTarget:m_seekForwardTarget.get()];
[[center seekBackwardCommand] removeTarget:m_seekBackwardTarget.get()];
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
[[center changePlaybackPositionCommand] removeTarget:m_seekToTimeTarget.get()];
-#endif
}
void RemoteCommandListenerIOS::updateSupportedCommands()
{
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
[[[getMPRemoteCommandCenterClass() sharedCommandCenter] changePlaybackPositionCommand] setEnabled:!!client().supportsSeeking()];
-#endif
}
}
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (219054 => 219055)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -139,7 +139,7 @@
@end
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
@interface NSHTTPCookie ()
@property (nullable, readonly, copy) NSString *_storagePartition;
@end
Modified: trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (219054 => 219055)
--- trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -188,7 +188,7 @@
CGFontAntialiasingStyle CGContextGetFontAntialiasingStyle(CGContextRef);
void CGContextSetFontAntialiasingStyle(CGContextRef, CGFontAntialiasingStyle);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
typedef struct CGPDFAnnotation *CGPDFAnnotationRef;
typedef bool (^CGPDFAnnotationDrawCallbackType)(CGContextRef context, CGPDFPageRef page, CGPDFAnnotationRef annotation);
void CGContextDrawPDFPageWithAnnotations(CGContextRef, CGPDFPageRef, CGPDFAnnotationDrawCallbackType);
Modified: trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (219054 => 219055)
--- trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -36,9 +36,7 @@
#import <DataDetectorsCore/DataDetectorsCore.h>
#if PLATFORM(IOS)
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
#import <DataDetectorsCore/DDOptionalSource.h>
-#endif
#import <DataDetectorsCore/DDURLifier.h>
#endif // PLATFORM(IOS)
Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (219054 => 219055)
--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -84,9 +84,6 @@
@property BOOL hitTestsAsOpaque;
@property BOOL needsLayoutOnGeometryChange;
@property BOOL shadowPathIsBounds;
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300 && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
-@property (copy) NSString *contentsFormat;
-#endif
@end
#if PLATFORM(IOS)
@@ -205,7 +202,7 @@
extern NSString * const kCAContextDisplayId;
extern NSString * const kCAContextIgnoresHitTest;
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+#if PLATFORM(IOS)
extern NSString * const kCAContentsFormatRGBA10XR;
#endif
@@ -213,10 +210,7 @@
extern NSString * const kCAContentsFormatRGBA8ColorRGBA8LinearGlyphMask;
#endif
-#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 100000) \
- || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000) \
- || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
- || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
@protocol CALayerDelegate <NSObject>
@end
Modified: trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h (219054 => 219055)
--- trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebCore/platform/spi/mac/AVFoundationSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -76,7 +76,7 @@
#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200) || PLATFORM(IOS)
#import <AVFoundation/AVAssetCache.h>
#else
@interface AVAssetCache : NSObject
Modified: trunk/Source/WebKit/mac/ChangeLog (219054 => 219055)
--- trunk/Source/WebKit/mac/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,3 +1,12 @@
+2017-07-01 Dan Bernstein <[email protected]>
+
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-07-01 Ryosuke Niwa <[email protected]>
Frame.h doesn't need to include FrameLoader.h, IntRect.h, and NavigationScheduler.h
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (219054 => 219055)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -45,8 +45,6 @@
ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
Modified: trunk/Source/WebKit2/ChangeLog (219054 => 219055)
--- trunk/Source/WebKit2/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,3 +1,26 @@
+2017-07-01 Dan Bernstein <[email protected]>
+
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Platform/spi/ios/UIKitSPI.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView dealloc]):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKFormInputSession setSuggestions:]):
+ (-[WKFormInputSession invalidate]):
+ (-[WKContentView insertTextSuggestion:]):
+ (contentTypeFromFieldName):
+ (-[WKContentView textInputTraits]):
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+ * config.h:
+
2017-07-01 Brady Eidson <[email protected]>
When setting a custom cookie storage location on a WKWebsiteDataStore, cookies aren't actually removed.
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (219054 => 219055)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -45,8 +45,6 @@
ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (219054 => 219055)
--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -78,9 +78,6 @@
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101100 = YES;
WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED_macosx_101200 = YES;
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphoneos9*] = YES;
-WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED[sdk=iphonesimulator9*] = YES;
-
WK_RELOCATABLE_FRAMEWORK_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES = -Wl,-not_for_dyld_shared_cache;
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (219054 => 219055)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -242,12 +242,6 @@
@property (nonatomic, readwrite, retain) UIResponder <UIKeyInput> *delegate;
@end
-@interface UIGestureRecognizer ()
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90200
-@property(nonatomic, copy) NSArray<NSNumber *> *allowedTouchTypes;
-#endif
-@end
-
@interface UILongPressGestureRecognizer ()
@property (nonatomic) CFTimeInterval delay;
@property (nonatomic, readonly) CGPoint startPoint;
@@ -299,16 +293,6 @@
- (CADisplay *)_display;
@end
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100
-typedef enum {
- UITouchTypeDirect
-} UITouchType;
-
-@interface UITouch ()
-@property(nonatomic,readonly) UITouchType type;
-@end
-#endif
-
@interface UIScrollView ()
- (void)_stopScrollingAndZoomingAnimations;
- (void)_zoomToCenter:(CGPoint)center scale:(CGFloat)scale duration:(CFTimeInterval)duration force:(BOOL)force;
@@ -385,13 +369,11 @@
- (void)willStartScrollingOverflow;
@end
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
@class UITextSuggestion;
@protocol UITextInputSuggestionDelegate <UITextInputDelegate>
- (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
@end
-#endif
@interface UIViewController ()
+ (UIViewController *)_viewControllerForFullScreenPresentationFromView:(UIView *)view;
@@ -569,11 +551,6 @@
@property (nonatomic, assign) NSRange rangeInMarkedText;
@end
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
-@protocol UIResponderStandardEditActions
-@end
-#endif
-
@interface UIWKTextInteractionAssistant : UITextInteractionAssistant <UIResponderStandardEditActions>
@end
@@ -926,9 +903,7 @@
extern const NSString *UIPreviewDataDDResult;
extern const NSString *UIPreviewDataDDContext;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
extern const NSString *UIPreviewDataAttachmentList;
extern const NSString *UIPreviewDataAttachmentIndex;
-#endif
WTF_EXTERN_C_END
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (219054 => 219055)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -143,7 +143,6 @@
#import <WebCore/WebBackgroundTaskController.h>
#import <WebCore/WebSQLiteDatabaseTrackerClient.h>
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
#if __has_include(<AccessibilitySupport.h>)
#include <AccessibilitySupport.h>
#else
@@ -151,7 +150,6 @@
CFStringRef kAXSAllowForceWebScalingEnabledNotification;
}
#endif
-#endif
#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(_page && _page->isAlwaysOnLoggingAllowed(), ViewState, __VA_ARGS__)
@@ -681,7 +679,7 @@
[_remoteObjectRegistry _invalidate];
[[_configuration _contentProviderRegistry] removePage:*_page];
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
+#if PLATFORM(IOS)
CFNotificationCenterRemoveObserver(CFNotificationCenterGetDarwinNotifyCenter(), (__bridge const void *)(self), nullptr, nullptr);
#endif
[[NSNotificationCenter defaultCenter] removeObserver:self];
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (219054 => 219055)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -394,19 +394,15 @@
- (void)setSuggestions:(NSArray<UITextSuggestion *> *)suggestions
{
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
_suggestions = adoptNS([suggestions copy]);
[suggestionDelegate setSuggestions:suggestions];
-#endif
}
- (void)invalidate
{
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
id <UITextInputSuggestionDelegate> suggestionDelegate = (id <UITextInputSuggestionDelegate>)_contentView.inputDelegate;
[suggestionDelegate setSuggestions:nil];
-#endif
_contentView = nil;
}
@@ -2979,7 +2975,6 @@
[self.inputDelegate selectionDidChange:self];
}
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
- (void)insertTextSuggestion:(UITextSuggestion *)textSuggestion
{
id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
@@ -2986,7 +2981,6 @@
if ([inputDelegate respondsToSelector:@selector(_webView:insertTextSuggestion:inInputSession:)])
[inputDelegate _webView:_webView insertTextSuggestion:textSuggestion inInputSession:_formInputSession.get()];
}
-#endif
- (NSString *)textInRange:(UITextRange *)range
{
@@ -3202,7 +3196,6 @@
return UITextAutocapitalizationTypeSentences;
}
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
static NSString *contentTypeFromFieldName(WebCore::AutofillFieldName fieldName)
{
switch (fieldName) {
@@ -3285,7 +3278,6 @@
return nil;
}
-#endif
// UITextInputPrivate protocol
// Direct access to the (private) UITextInputTraits object.
@@ -3328,9 +3320,7 @@
[_traits setKeyboardType:UIKeyboardTypeDefault];
}
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
[_traits setTextContentType:contentTypeFromFieldName(_assistedNodeInformation.autofillFieldName)];
-#endif
return _traits.get();
}
@@ -5008,7 +4998,6 @@
*type = UIPreviewItemTypeImage;
dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
} else if (canShowAttachmentPreview) {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
*type = UIPreviewItemTypeAttachment;
auto element = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeAttachment URL:(NSURL *)linkURL location:_positionInformation.request.point title:_positionInformation.title ID:_positionInformation.idAttribute rect:_positionInformation.bounds image:nil]);
NSUInteger index = [uiDelegate _webView:_webView indexIntoAttachmentListForElement:element.get()];
@@ -5023,7 +5012,6 @@
// FIXME: Replace the following NSString literal with a UIKit NSString constant.
dataForPreview[@"UIPreviewDataAttachmentListSourceIsManaged"] = [NSNumber numberWithBool:sourceIsManaged];
}
-#endif
}
return dataForPreview;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (219054 => 219055)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -2535,9 +2535,7 @@
FloatSize bitmapSize = scaledSize.width() < image->size().width() ? scaledSize : image->size();
// FIXME: Only select ExtendedColor on images known to need wide gamut
ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
flags |= screenSupportsExtendedColor() ? ShareableBitmap::SupportsExtendedColor : 0;
-#endif
if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), flags)) {
auto graphicsContext = sharedBitmap->createGraphicsContext();
graphicsContext->drawImage(*image, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height()));
Modified: trunk/Source/WebKit2/config.h (219054 => 219055)
--- trunk/Source/WebKit2/config.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/WebKit2/config.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -73,11 +73,7 @@
#endif
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) \
- || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) \
- || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 100000) \
- || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 30000) \
- || USE(SOUP)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) || USE(SOUP)
#ifndef USE_NETWORK_SESSION
#define USE_NETWORK_SESSION 1
#endif
Modified: trunk/Source/bmalloc/ChangeLog (219054 => 219055)
--- trunk/Source/bmalloc/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/bmalloc/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,5 +1,16 @@
2017-07-01 Dan Bernstein <[email protected]>
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * bmalloc/BPlatform.h:
+ * bmalloc/VMAllocate.h:
+ (bmalloc::vmPageSizePhysical):
+
+2017-07-01 Dan Bernstein <[email protected]>
+
[macOS] Remove code only needed when building for OS X Yosemite
https://bugs.webkit.org/show_bug.cgi?id=174067
Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (219054 => 219055)
--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -194,6 +194,6 @@
#define BATTRIBUTE_PRINTF(formatStringArgument, extraArguments) __attribute__((__format__(printf, formatStringArgument, extraArguments)))
-#if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (BPLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || BPLATFORM(IOS)
#define BUSE_OS_LOG 1
#endif
Modified: trunk/Source/bmalloc/bmalloc/VMAllocate.h (219054 => 219055)
--- trunk/Source/bmalloc/bmalloc/VMAllocate.h 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Source/bmalloc/bmalloc/VMAllocate.h 2017-07-02 02:06:40 UTC (rev 219055)
@@ -87,7 +87,7 @@
inline size_t vmPageSizePhysical()
{
-#if (BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if BPLATFORM(IOS)
return vm_kernel_page_size;
#else
static size_t cached;
Modified: trunk/Tools/ChangeLog (219054 => 219055)
--- trunk/Tools/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Tools/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,3 +1,16 @@
+2017-07-01 Dan Bernstein <[email protected]>
+
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration):
+ * WebKitTestRunner/ios/HIDEventGenerator.mm:
+ (-[HIDEventGenerator _createIOHIDEventType:]):
+
2017-07-01 Brady Eidson <[email protected]>
When setting a custom cookie storage location on a WKWebsiteDataStore, cookies aren't actually removed.
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (219054 => 219055)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-07-02 02:06:40 UTC (rev 219055)
@@ -45,8 +45,6 @@
ENABLE_APPLE_PAY[sdk=iphone*] = $(ENABLE_APPLE_PAY_$(PLATFORM_NAME));
ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY[sdk=iphoneos9*] = ;
-ENABLE_APPLE_PAY[sdk=iphonesimulator9*] = ;
DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_1012000);
ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (219054 => 219055)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -71,11 +71,11 @@
globalWebViewConfiguration.websiteDataStore = (WKWebsiteDataStore *)WKContextGetWebsiteDataStore(context);
globalWebViewConfiguration._allowUniversalAccessFromFileURLs = YES;
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS)
globalWebViewConfiguration._applePayEnabled = YES;
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)
WKCookieManagerSetCookieStoragePartitioningEnabled(WKContextGetCookieManager(context), true);
#endif
Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (219054 => 219055)
--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2017-07-02 02:06:40 UTC (rev 219055)
@@ -393,15 +393,9 @@
RetainPtr<IOHIDEventRef> subEvent;
if (pointInfo->isStylus) {
if (eventType == StylusEventTouched) {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
eventMask |= kIOHIDDigitizerEventEstimatedAltitude;
eventMask |= kIOHIDDigitizerEventEstimatedAzimuth;
eventMask |= kIOHIDDigitizerEventEstimatedPressure;
-#else
- eventMask |= kIOHIDDigitizerEventUpdateAltitudeMask;
- eventMask |= kIOHIDDigitizerEventUpdateAzimuthMask;
- eventMask |= kIOHIDDigitizerEventUpdatePressureMask;
-#endif
} else if (eventType == StylusEventMoved)
eventMask = kIOHIDDigitizerEventPosition;
Modified: trunk/WebKitLibraries/ChangeLog (219054 => 219055)
--- trunk/WebKitLibraries/ChangeLog 2017-07-01 23:29:07 UTC (rev 219054)
+++ trunk/WebKitLibraries/ChangeLog 2017-07-02 02:06:40 UTC (rev 219055)
@@ -1,3 +1,22 @@
+2017-07-01 Dan Bernstein <[email protected]>
+
+ [iOS] Remove code only needed when building for iOS 9.x
+ https://bugs.webkit.org/show_bug.cgi?id=174068
+
+ Reviewed by Tim Horton.
+
+ * WebKitPrivateFrameworkStubs/iOS/9: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/AppSupport.framework/AppSupport.tbd: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/AssertionServices.framework/AssertionServices.tbd: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/CorePDF.framework/CorePDF.tbd: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/GraphicsServices.framework/GraphicsServices.tbd: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework: Removed.
+ * WebKitPrivateFrameworkStubs/iOS/9/IOSurface.framework/IOSurface.tbd: Removed.
+
2017-06-29 Jonathan Bedard <[email protected]>
Add WebKitSystemInterface for iOS 11
