Diff
Modified: trunk/Source/_javascript_Core/API/JSManagedValue.mm (237606 => 237607)
--- trunk/Source/_javascript_Core/API/JSManagedValue.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/_javascript_Core/API/JSManagedValue.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -38,7 +38,6 @@
#import "ObjcRuntimeExtras.h"
#import "JSCInlines.h"
#import <wtf/NeverDestroyed.h>
-#import <wtf/spi/cocoa/NSMapTableSPI.h>
class JSManagedValueHandleOwner : public JSC::WeakHandleOwner {
public:
Modified: trunk/Source/_javascript_Core/API/JSVirtualMachine.mm (237606 => 237607)
--- trunk/Source/_javascript_Core/API/JSVirtualMachine.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/_javascript_Core/API/JSVirtualMachine.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -40,7 +40,6 @@
#import <mutex>
#import <wtf/BlockPtr.h>
#import <wtf/Lock.h>
-#import <wtf/spi/cocoa/NSMapTableSPI.h>
static NSMapTable *globalWrapperCache = 0;
Modified: trunk/Source/_javascript_Core/API/JSWrapperMap.mm (237606 => 237607)
--- trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/_javascript_Core/API/JSWrapperMap.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -39,7 +39,6 @@
#import "WeakGCMap.h"
#import "WeakGCMapInlines.h"
#import <wtf/Vector.h>
-#import <wtf/spi/cocoa/NSMapTableSPI.h>
#import <wtf/spi/darwin/dyldSPI.h>
#include <mach-o/dyld.h>
Modified: trunk/Source/_javascript_Core/ChangeLog (237606 => 237607)
--- trunk/Source/_javascript_Core/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,14 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * API/JSManagedValue.mm:
+ * API/JSVirtualMachine.mm:
+ * API/JSWrapperMap.mm:
+
2018-10-30 Ross Kirsling <ross.kirsl...@sony.com>
useProbeOSRExit causes failures for Win64 DFG JIT
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (237606 => 237607)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,12 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:
+
2018-10-29 Youenn Fablet <you...@apple.com>
Handle MDNS resolution of candidates through libwebrtc directly
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h (237606 => 237607)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -36,9 +36,9 @@
#if (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
#define ENABLE_VCP_ENCODER 0
#elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
-#define ENABLE_VCP_ENCODER (__IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
+#define ENABLE_VCP_ENCODER 1
#elif (defined(TARGET_OS_MAC) && TARGET_OS_MAC)
-#define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
+#define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
#endif
#endif
Modified: trunk/Source/WTF/ChangeLog (237606 => 237607)
--- trunk/Source/WTF/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WTF/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,14 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/PlatformMac.cmake:
+ * wtf/spi/cocoa/NSMapTableSPI.h: Removed. This was only needed for old SDKs.
+
2018-10-29 Mark Lam <mark....@apple.com>
Correctly detect string overflow when using the 'Function' constructor.
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (237606 => 237607)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2018-10-30 22:45:28 UTC (rev 237607)
@@ -615,7 +615,6 @@
CD5497AB15857D0300B5BC30 /* MediaTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTime.h; sourceTree = "<group>"; };
CD6D9FCD1EEF3AD4008B0671 /* Algorithms.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Algorithms.h; sourceTree = "<group>"; };
CD7600FF1F90A3CA00026E26 /* UnsafePointer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UnsafePointer.h; sourceTree = "<group>"; };
- CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
DCEE21FA1CEA7538000C2396 /* CFBundleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFBundleSPI.h; sourceTree = "<group>"; };
DCEE21FC1CEA7551000C2396 /* BlockObjCExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockObjCExceptions.h; sourceTree = "<group>"; };
@@ -1296,7 +1295,6 @@
isa = PBXGroup;
children = (
9384B73E20DEA284005B73B2 /* CFXPCBridgeSPI.h */,
- CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */,
93D191CF20CAECE800C51B8E /* objcSPI.h */,
A5098B011C16A4F900087797 /* SecuritySPI.h */,
);
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (237606 => 237607)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2018-10-30 22:45:28 UTC (rev 237607)
@@ -21,7 +21,6 @@
spi/cf/CFBundleSPI.h
spi/cf/CFStringSPI.h
- spi/cocoa/NSMapTableSPI.h
spi/cocoa/SecuritySPI.h
spi/cocoa/objcSPI.h
Deleted: trunk/Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h (237606 => 237607)
--- trunk/Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WTF/wtf/spi/cocoa/NSMapTableSPI.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/NSMapTable.h>
-
-#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
-
-#if USE(APPLE_INTERNAL_SDK)
-#import <Foundation/NSMapTablePriv.h>
-#endif
-
-WTF_EXTERN_C_BEGIN
-
-void *NSMapGet(NSMapTable *, const void *key);
-void NSMapInsert(NSMapTable *, const void *key, const void *value);
-void NSMapRemove(NSMapTable *, const void *key);
-
-WTF_EXTERN_C_END
-
-#endif
Modified: trunk/Source/WebCore/ChangeLog (237606 => 237607)
--- trunk/Source/WebCore/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,18 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::exernalDeviceDisplayNameForPlayer):
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::globalPointForEvent):
+ (WebCore::pointForEvent):
+ (WebCore::mouseButtonForEvent):
+ (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
+
2018-10-30 Ali Juma <aj...@chromium.org>
Calling window.open("", "_self") allows working around restrictions on window.close()
Modified: trunk/Source/WebCore/PAL/ChangeLog (237606 => 237607)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,19 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * pal/cf/CoreMediaSoftLink.cpp:
+ * pal/cf/CoreMediaSoftLink.h:
+ Behavior change here. The check didn't really make sense, pretty sure we would
+ just crash when hitting this code path on iOS.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+ * pal/spi/cocoa/PassKitSPI.h:
+ * pal/spi/mac/AVFoundationSPI.h:
+
2018-10-29 Tim Horton <timothy_hor...@apple.com>
Modernize WebKit nibs and lprojs for localization's sake
Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (237606 => 237607)
--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2018-10-30 22:45:28 UTC (rev 237607)
@@ -35,10 +35,10 @@
#include <CoreVideo/CoreVideo.h>
#endif
-#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101400)
+#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
+#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
+#else
#define CMSAMPLEBUFFERCALL_NOESCAPE
-#else
-#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
#endif
@@ -159,11 +159,8 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMAudioFormatDescriptionCreate, OSStatus, (CFAllocatorRef allocator, const AudioStreamBasicDescription* asbd, size_t layoutSize, const AudioChannelLayout* layout, size_t magicCookieSize, const void* magicCookie, CFDictionaryRef extensions, CMAudioFormatDescriptionRef* outDesc), (allocator, asbd, layoutSize, layout, magicCookieSize, magicCookie, extensions, outDesc))
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetHostTimeClock, CMClockRef, (void), ())
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
-
-#if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(IOSMAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallBlockForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (^ CMSAMPLEBUFFERCALL_NOESCAPE handler)(CMSampleBufferRef, CMItemCount)), (sbuf, handler))
-#endif
#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (237606 => 237607)
--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -37,10 +37,10 @@
#define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
#endif
-#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101400)
+#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
+#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
+#else
#define CMSAMPLEBUFFERCALL_NOESCAPE
-#else
-#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
#endif
SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, CoreMedia)
@@ -270,15 +270,11 @@
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
#define CMClockGetTime softLink_CoreMedia_CMClockGetTime
-#if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(IOSMAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
-
-SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
+SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)(CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
#define CMSampleBufferCallForEachSample softLink_CoreMedia_CMSampleBufferCallForEachSample
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMSampleBufferCallBlockForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (^ CMSAMPLEBUFFERCALL_NOESCAPE handler)(CMSampleBufferRef, CMItemCount)), (sbuf, handler))
#define CMSampleBufferCallBlockForEachSample softLink_CoreMedia_CMSampleBufferCallBlockForEachSample
-#endif
-
#endif // PLATFORM(COCOA)
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (237606 => 237607)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -34,7 +34,7 @@
// The SPI header should define which CFNetwork features *exist* in the underlying system, but not
// policy about what WebKit should do. Accordingly, we should move this somewhere else or rename it
// to be about CFNetwork capabilities (HAVE) rather than about WebKit policy (USE).
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40200) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 110200))
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (PLATFORM(TVOS) && __TV_OS_VERSION_MIN_REQUIRED >= 120000))
#define USE_CFNETWORK_IGNORE_HSTS 1
#endif
@@ -247,7 +247,7 @@
extern const CFStringRef _kCFURLConnectionPropertyShouldSniff;
extern const CFStringRef _kCFURLStorageSessionIsPrivate;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101302
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
extern const CFStringRef kCFURLRequestContentDecoderSkipURLCheck;
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (237606 => 237607)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -247,7 +247,7 @@
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didRequestMerchantSession:(void(^)(PKPaymentMerchantSession *, NSError *))sessionBlock;
@end
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
typedef NS_ENUM(NSUInteger, PKPaymentRequestAPIType) {
PKPaymentRequestAPITypeInApp = 0,
PKPaymentRequestAPITypeWebJS,
@@ -276,7 +276,7 @@
PKPaymentButtonTypeSetUp,
PKPaymentButtonTypeInStore,
PKPaymentButtonTypeDonate,
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || PLATFORM(IOS_FAMILY)
PKPaymentButtonTypeCheckout,
PKPaymentButtonTypeBook,
PKPaymentButtonTypeSubscribe,
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (237606 => 237607)
--- trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -54,7 +54,7 @@
#import <AVFoundation/AVPlayerItem.h>
#import <AVFoundation/AVPlayerLayer.h>
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
NS_ASSUME_NONNULL_BEGIN
@interface AVPlayerItem ()
@property (nonatomic, readonly) NSTimeInterval seekableTimeRangesLastModifiedTime NS_AVAILABLE(10_13, 11_0);
@@ -61,7 +61,7 @@
@property (nonatomic, readonly) NSTimeInterval liveUpdateInterval;
@end
NS_ASSUME_NONNULL_END
-#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
+#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
#if ENABLE(WIRELESS_PLAYBACK_TARGET) || PLATFORM(IOS_FAMILY)
@@ -235,7 +235,7 @@
#endif // __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
#import <AVFoundation/AVQueuedSampleBufferRendering.h>
@class AVVideoPerformanceMetrics;
NS_ASSUME_NONNULL_BEGIN
@@ -273,7 +273,7 @@
NS_ASSUME_NONNULL_END
#endif // __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
// Nothing to do, AVfoundation/AVQueuedSampleBufferRendering.h was imported above.
#elif __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
#import <AVFoundation/AVSampleBufferAudioRenderer.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (237606 => 237607)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -2809,7 +2809,6 @@
if (!AVFoundationLibrary())
return nil;
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
if ([getAVOutputContextClass() respondsToSelector:@selector(sharedAudioPresentationOutputContext)]) {
AVOutputContext *outputContext = [getAVOutputContextClass() sharedAudioPresentationOutputContext];
@@ -2828,7 +2827,6 @@
return [outputDeviceNames componentsJoinedByString:@" + "];
}
-#endif
if (player.externalPlaybackType != AVPlayerExternalPlaybackTypeAirPlay)
return nil;
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (237606 => 237607)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -54,7 +54,7 @@
static NSPoint globalPointForEvent(NSEvent *event)
{
switch ([event type]) {
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
case NSEventTypePressure:
#endif
case NSEventTypeLeftMouseDown:
@@ -79,7 +79,7 @@
static IntPoint pointForEvent(NSEvent *event, NSView *windowView)
{
switch ([event type]) {
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
case NSEventTypePressure:
#endif
case NSEventTypeLeftMouseDown:
@@ -110,7 +110,7 @@
static MouseButton mouseButtonForEvent(NSEvent *event)
{
switch ([event type]) {
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
case NSEventTypePressure:
#endif
case NSEventTypeLeftMouseDown:
@@ -723,7 +723,7 @@
// PlatformEvent
m_type = mouseEventTypeForEvent(event);
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
BOOL eventIsPressureEvent = [event type] == NSEventTypePressure;
if (eventIsPressureEvent) {
// Since AppKit doesn't send mouse events for force down or force up, we have to use the current pressure
@@ -753,7 +753,7 @@
#endif
m_force = 0;
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
int stage = eventIsPressureEvent ? event.stage : correspondingPressureEvent.stage;
double pressure = eventIsPressureEvent ? event.pressure : correspondingPressureEvent.pressure;
m_force = pressure + stage;
Modified: trunk/Source/WebKit/ChangeLog (237606 => 237607)
--- trunk/Source/WebKit/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,21 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTaskCocoa::applySniffingPoliciesAndBindRequestToInferfaceIfNeeded):
+ * Platform/spi/Cocoa/DeviceIdentitySPI.h:
+ * Platform/spi/ios/UIKitSPI.h:
+ * Shared/WebPreferencesDefaultValues.cpp:
+ (defaultCustomPasteboardDataEnabled):
+ * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+ (WebKit::toPKPaymentRequest):
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView changeSelectionWithTouchAt:withSelectionTouch:baseIsStart:]): Deleted.
+
2018-10-30 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r237600 and r237604.
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (237606 => 237607)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -83,7 +83,7 @@
{
#if !PLATFORM(MAC)
UNUSED_PARAM(shouldContentEncodingSniff);
-#elif __MAC_OS_X_VERSION_MIN_REQUIRED < 101302
+#elif __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
shouldContentEncodingSniff = true;
#endif
auto& cocoaSession = static_cast<NetworkSessionCocoa&>(m_session.get());
@@ -95,7 +95,7 @@
auto mutableRequest = adoptNS([nsRequest mutableCopy]);
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101302
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
if (!shouldContentEncodingSniff)
[mutableRequest _setProperty:@(YES) forKey:(NSString *)kCFURLRequestContentDecoderSkipURLCheck];
#endif
Modified: trunk/Source/WebKit/Platform/spi/Cocoa/DeviceIdentitySPI.h (237606 => 237607)
--- trunk/Source/WebKit/Platform/spi/Cocoa/DeviceIdentitySPI.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/Platform/spi/Cocoa/DeviceIdentitySPI.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -31,10 +31,6 @@
#if USE(APPLE_INTERNAL_SDK)
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 110300
-extern NSString * _Nonnull const kMAOptionsBAAAccessControls;
-#endif
-
extern "C" {
#import <DeviceIdentity/DeviceIdentity.h>
}
Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (237606 => 237607)
--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -341,9 +341,7 @@
@property (nonatomic, readonly) BOOL _isInterruptingDeceleration;
@property (nonatomic, getter=_contentScrollInset, setter=_setContentScrollInset:) UIEdgeInsets contentScrollInset;
@property (nonatomic, getter=_indicatorInsetAdjustmentBehavior, setter=_setIndicatorInsetAdjustmentBehavior:) UIScrollViewIndicatorInsetAdjustmentBehavior indicatorInsetAdjustmentBehavior;
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
@property (nonatomic, readonly) UIEdgeInsets _systemContentInset;
-#endif
@end
@interface NSString (UIKitDetails)
@@ -492,9 +490,7 @@
- (void)setSize:(CGSize)size;
@property (nonatomic, assign, setter=_setBackdropMaskViewFlags:) NSInteger _backdropMaskViewFlags;
- (void)_populateArchivedSubviews:(NSMutableSet *)encodedViews;
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
- (void)safeAreaInsetsDidChange;
-#endif
@property (nonatomic, setter=_setContinuousCornerRadius:) CGFloat _continuousCornerRadius;
- (void)insertSubview:(UIView *)view above:(UIView *)sibling;
- (void)viewWillMoveToSuperview:(UIView *)newSuperview;
@@ -631,9 +627,6 @@
- (BOOL)hasMarkedText;
- (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 110000
-- (BOOL)pointIsInAssistedNode:(CGPoint)point;
-#endif
- (NSArray *)webSelectionRects;
- (void)_cancelLongPressGestureRecognizer;
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (237606 => 237607)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2018-10-30 22:45:28 UTC (rev 237607)
@@ -46,7 +46,7 @@
bool defaultCustomPasteboardDataEnabled()
{
-#if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300
+#if PLATFORM(IOS_FAMILY)
return WebCore::IOSApplication::isMobileSafari() || dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_11_3;
#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
return WebCore::MacApplication::isSafari() || dyld_get_program_sdk_version() > DYLD_MACOSX_VERSION_10_13;
Modified: trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (237606 => 237607)
--- trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -149,7 +149,7 @@
return result;
}
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment handler:(void (^)(PKPaymentAuthorizationResult *result))completion
{
@@ -498,8 +498,7 @@
}
#endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) \
- || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
static PKPaymentRequestAPIType toAPIType(WebCore::ApplePaySessionPaymentRequest::Requester requester)
{
switch (requester) {
@@ -526,8 +525,7 @@
} else if (!linkIconURLs.isEmpty())
[result setThumbnailURL:linkIconURLs[0]];
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) \
- || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
[result setAPIType:toAPIType(paymentRequest.requester())];
#endif
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (237606 => 237607)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -2894,13 +2894,6 @@
});
}
-#if __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
-- (void)changeSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch baseIsStart:(BOOL)baseIsStart
-{
- [self changeSelectionWithTouchAt:point withSelectionTouch:touch baseIsStart:baseIsStart withFlags:UIWKNone];
-}
-#endif
-
- (void)changeSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch baseIsStart:(BOOL)baseIsStart withFlags:(UIWKSelectionFlags)flags
{
_usingGestureForSelection = YES;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (237606 => 237607)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,14 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView pressureChangeWithEvent:]):
+ * WebView/WebPDFView.h:
+
2018-10-30 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r237600 and r237604.
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (237606 => 237607)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -4491,7 +4491,7 @@
- (void)pressureChangeWithEvent:(NSEvent *)event
{
-#if PLATFORM(MAC) && defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if PLATFORM(MAC) && defined(__LP64__)
NSEvent *lastPressureEvent = [[self _webView] _pressureEvent];
if (event.phase != NSEventPhaseChanged && event.phase != NSEventPhaseBegan && event.phase != NSEventPhaseEnded)
return;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h (237606 => 237607)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h 2018-10-30 22:45:28 UTC (rev 237607)
@@ -33,11 +33,6 @@
@class WebDataSource;
-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
-@protocol PDFViewDelegate <NSObject>
-@end
-#endif
-
@interface WebPDFView : NSView <PDFViewDelegate, WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
{
PDFView *PDFSubview;
Modified: trunk/Tools/ChangeLog (237606 => 237607)
--- trunk/Tools/ChangeLog 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Tools/ChangeLog 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1,3 +1,14 @@
+2018-10-30 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up some obsolete MAX_ALLOWED macros
+ https://bugs.webkit.org/show_bug.cgi?id=190916
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
+ * TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm:
+
2018-10-30 Claudio Saavedra <csaave...@igalia.com>
[GTK][WPE] Fixes to the PublicSuffix implementation
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp (237606 => 237607)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp 2018-10-30 22:45:28 UTC (rev 237607)
@@ -32,19 +32,11 @@
#if PLATFORM(IOS_FAMILY)
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 101000
asm(".linker_option \"-lTestWTFAlwaysMissing-iOS-v2\"");
-#else
-asm(".linker_option \"-lTestWTFAlwaysMissing-iOS\"");
-#endif
#else
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
asm(".linker_option \"-lTestWTFAlwaysMissing-macOS-v2\"");
-#else
-asm(".linker_option \"-lTestWTFAlwaysMissing-macOS\"");
-#endif
#endif
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm (237606 => 237607)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -404,8 +404,8 @@
}
#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
-// FIXME: This should be removed once <rdar://problem/35344202> is resolved and bots are updated.
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED <= 110102)
+// FIXME: This #if should be removed once <rdar://problem/35344202> is resolved and bots are updated.
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301
TEST(WebKit, WKHTTPCookieStoreNonPersistent)
{
RetainPtr<WKWebsiteDataStore> nonPersistentDataStore;
@@ -434,7 +434,7 @@
auto customDataStore = adoptNS([[WKWebsiteDataStore alloc] _initWithConfiguration:websiteDataStoreConfiguration.get()]);
runTestWithWebsiteDataStore(customDataStore.get());
}
-#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED <= 110102)
+#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301
TEST(WebKit, CookieObserverCrash)
{
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm (237606 => 237607)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm 2018-10-30 22:35:49 UTC (rev 237606)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm 2018-10-30 22:45:28 UTC (rev 237607)
@@ -1372,7 +1372,7 @@
}
// FIXME: Re-enable this test once we resolve <https://bugs.webkit.org/show_bug.cgi?id=175204>
-#if __IPHONE_OS_VERSION_MAX_ALLOWED <= 110401
+#if 0
TEST(DragAndDropTests, CustomActionSheetPopover)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
