⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 237607 in webkit


Ignore:
Timestamp:
Oct 30, 2018, 3:45:28 PM (8 years ago)
Author:
ap@apple.com
Message:

Clean up some obsolete MAX_ALLOWED macros
​https://bugs.webkit.org/show_bug.cgi?id=190916

Reviewed by Tim Horton.

Source/JavaScriptCore:

  • API/JSManagedValue.mm:
  • API/JSVirtualMachine.mm:
  • API/JSWrapperMap.mm:

Source/ThirdParty/libwebrtc:

  • Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:

Source/WebCore:

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::exernalDeviceDisplayNameForPlayer):

  • platform/mac/PlatformEventFactoryMac.mm:

(WebCore::globalPointForEvent):
(WebCore::pointForEvent):
(WebCore::mouseButtonForEvent):
(WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):

Source/WebCore/PAL:

  • 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:

Source/WebKit:

  • 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.

Source/WebKitLegacy/mac:

  • WebView/WebHTMLView.mm:

(-[WebHTMLView pressureChangeWithEvent:]):

  • WebView/WebPDFView.h:

Source/WTF:

  • WTF.xcodeproj/project.pbxproj:
  • wtf/PlatformMac.cmake:
  • wtf/spi/cocoa/NSMapTableSPI.h: Removed. This was only needed for old SDKs.

Tools:

  • TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp:
  • TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
  • TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm:
Location:
trunk
Files:
1 deleted
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSManagedValue.mm

    r235271 r237607  
    3939#import "JSCInlines.h"
    4040#import <wtf/NeverDestroyed.h>
    41 #import <wtf/spi/cocoa/NSMapTableSPI.h>
    4241
    4342class JSManagedValueHandleOwner : public JSC::WeakHandleOwner {

  • trunk/Source/JavaScriptCore/API/JSVirtualMachine.mm

    r236372 r237607  
    4141#import <wtf/BlockPtr.h>
    4242#import <wtf/Lock.h>
    43 #import <wtf/spi/cocoa/NSMapTableSPI.h>
    4443
    4544static NSMapTable *globalWrapperCache = 0;

  • trunk/Source/JavaScriptCore/API/JSWrapperMap.mm

    r237266 r237607  
    4040#import "WeakGCMapInlines.h"
    4141#import <wtf/Vector.h>
    42 #import <wtf/spi/cocoa/NSMapTableSPI.h>
    4342#import <wtf/spi/darwin/dyldSPI.h>
    4443

  • trunk/Source/JavaScriptCore/ChangeLog

    r237595 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * API/JSManagedValue.mm:
     9        * API/JSVirtualMachine.mm:
     10        * API/JSWrapperMap.mm:
     11
    1122018-10-30  Ross Kirsling  <ross.kirsling@sony.com>
    213

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r237568 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h:
     9
    1102018-10-29  Youenn Fablet  <youenn@apple.com>
    211

  • trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/WebKit/VideoProcessingSoftLink.h

    r236076 r237607  
    3737#define ENABLE_VCP_ENCODER 0
    3838#elif (defined(TARGET_OS_IPHONE)  && TARGET_OS_IPHONE)
    39 #define ENABLE_VCP_ENCODER (__IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
     39#define ENABLE_VCP_ENCODER 1
    4040#elif (defined(TARGET_OS_MAC) && TARGET_OS_MAC)
    41 #define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
     41#define ENABLE_VCP_ENCODER (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304)
    4242#endif
    4343

  • trunk/Source/WTF/ChangeLog

    r237577 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * WTF.xcodeproj/project.pbxproj:
     9        * wtf/PlatformMac.cmake:
     10        * wtf/spi/cocoa/NSMapTableSPI.h: Removed. This was only needed for old SDKs.
     11
    1122018-10-29  Mark Lam  <mark.lam@apple.com>
    213

  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r237566 r237607  
    616616                CD6D9FCD1EEF3AD4008B0671 /* Algorithms.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Algorithms.h; sourceTree = "<group>"; };
    617617                CD7600FF1F90A3CA00026E26 /* UnsafePointer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UnsafePointer.h; sourceTree = "<group>"; };
    618                 CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
    619618                CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
    620619                DCEE21FA1CEA7538000C2396 /* CFBundleSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFBundleSPI.h; sourceTree = "<group>"; };
    … …  
    12971296                        children = (
    12981297                                9384B73E20DEA284005B73B2 /* CFXPCBridgeSPI.h */,
    1299                                 CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */,
    13001298                                93D191CF20CAECE800C51B8E /* objcSPI.h */,
    13011299                                A5098B011C16A4F900087797 /* SecuritySPI.h */,

  • trunk/Source/WTF/wtf/PlatformMac.cmake

    r236617 r237607  
    2222    spi/cf/CFStringSPI.h
    2323
    24     spi/cocoa/NSMapTableSPI.h
    2524    spi/cocoa/SecuritySPI.h
    2625    spi/cocoa/objcSPI.h

  • trunk/Source/WebCore/ChangeLog

    r237598 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     9        (WebCore::exernalDeviceDisplayNameForPlayer):
     10        * platform/mac/PlatformEventFactoryMac.mm:
     11        (WebCore::globalPointForEvent):
     12        (WebCore::pointForEvent):
     13        (WebCore::mouseButtonForEvent):
     14        (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
     15
    1162018-10-30  Ali Juma  <ajuma@chromium.org>
    217

  • trunk/Source/WebCore/PAL/ChangeLog

    r237566 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * pal/cf/CoreMediaSoftLink.cpp:
     9        * pal/cf/CoreMediaSoftLink.h:
     10        Behavior change here. The check didn't really make sense, pretty sure we would
     11        just crash when hitting this code path on iOS.
     12
     13        * pal/spi/cf/CFNetworkSPI.h:
     14        * pal/spi/cocoa/PassKitSPI.h:
     15        * pal/spi/mac/AVFoundationSPI.h:
     16
    1172018-10-29  Tim Horton  <timothy_horton@apple.com>
    218

  • trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp

    r237266 r237607  
    3636#endif
    3737
    38 #if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101400)
     38#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
     39#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
     40#else
    3941#define CMSAMPLEBUFFERCALL_NOESCAPE
    40 #else
    41 #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
    4242#endif
    4343
    … …  
    160160SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetHostTimeClock, CMClockRef, (void), ())
    161161SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
    162 
    163 #if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(IOSMAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
    164162SOFT_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))
    165163SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallBlockForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (^ CMSAMPLEBUFFERCALL_NOESCAPE handler)(CMSampleBufferRef, CMItemCount)), (sbuf, handler))
    166 #endif
    167164
    168165#endif // PLATFORM(COCOA)

  • trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h

    r237266 r237607  
    3838#endif
    3939
    40 #if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101400)
     40#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400)
     41#define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
     42#else
    4143#define CMSAMPLEBUFFERCALL_NOESCAPE
    42 #else
    43 #define CMSAMPLEBUFFERCALL_NOESCAPE CF_NOESCAPE
    4444#endif
    4545
    … …  
    271271#define CMClockGetTime  softLink_CoreMedia_CMClockGetTime
    272272
    273 #if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(IOSMAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
    274 
    275 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))
     273SOFT_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))
    276274#define CMSampleBufferCallForEachSample softLink_CoreMedia_CMSampleBufferCallForEachSample
    277275SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMSampleBufferCallBlockForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (^ CMSAMPLEBUFFERCALL_NOESCAPE handler)(CMSampleBufferRef, CMItemCount)), (sbuf, handler))
    278276#define CMSampleBufferCallBlockForEachSample softLink_CoreMedia_CMSampleBufferCallBlockForEachSample
    279 
    280 #endif
    281277
    282278#endif // PLATFORM(COCOA)

  • trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

    r237266 r237607  
    3535// policy about what WebKit should do. Accordingly, we should move this somewhere else or rename it
    3636// to be about CFNetwork capabilities (HAVE) rather than about WebKit policy (USE).
    37 #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))
     37#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))
    3838#define USE_CFNETWORK_IGNORE_HSTS 1
    3939#endif
    … …  
    248248extern const CFStringRef _kCFURLStorageSessionIsPrivate;
    249249
    250 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101302
     250#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
    251251extern const CFStringRef kCFURLRequestContentDecoderSkipURLCheck;
    252252#endif

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h

    r237266 r237607  
    248248@end
    249249
    250 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300)
     250#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
    251251typedef NS_ENUM(NSUInteger, PKPaymentRequestAPIType) {
    252252    PKPaymentRequestAPITypeInApp = 0,
    … …  
    277277    PKPaymentButtonTypeInStore,
    278278    PKPaymentButtonTypeDonate,
    279 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000)
     279#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400) || PLATFORM(IOS_FAMILY)
    280280    PKPaymentButtonTypeCheckout,
    281281    PKPaymentButtonTypeBook,

  • trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h

    r237266 r237607  
    5555#import <AVFoundation/AVPlayerLayer.h>
    5656
    57 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
     57#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
    5858NS_ASSUME_NONNULL_BEGIN
    5959@interface AVPlayerItem ()
    … …  
    6262@end
    6363NS_ASSUME_NONNULL_END
    64 #endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
     64#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
    6565
    6666#if ENABLE(WIRELESS_PLAYBACK_TARGET) || PLATFORM(IOS_FAMILY)
    … …  
    236236#endif // __has_include(<AVFoundation/AVSampleBufferRenderSynchronizer.h>)
    237237
    238 #if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
     238#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
    239239#import <AVFoundation/AVQueuedSampleBufferRendering.h>
    240240@class AVVideoPerformanceMetrics;
    … …  
    274274#endif // __has_include(<AVFoundation/AVSampleBufferDisplayLayer.h>)
    275275
    276 #if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED < 110000)) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
     276#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101300) && __has_include(<AVFoundation/AVQueuedSampleBufferRendering.h>)
    277277// Nothing to do, AVfoundation/AVQueuedSampleBufferRendering.h was imported above.
    278278#elif __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r237405 r237607  
    28102810        return nil;
    28112811
    2812 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
    28132812    if ([getAVOutputContextClass() respondsToSelector:@selector(sharedAudioPresentationOutputContext)]) {
    28142813        AVOutputContext *outputContext = [getAVOutputContextClass() sharedAudioPresentationOutputContext];
    … …  
    28292828        return [outputDeviceNames componentsJoinedByString:@" + "];
    28302829    }
    2831 #endif
    28322830
    28332831    if (player.externalPlaybackType != AVPlayerExternalPlaybackTypeAirPlay)

  • trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm

    r235935 r237607  
    5555{
    5656    switch ([event type]) {
    57 #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     57#if defined(__LP64__)
    5858    case NSEventTypePressure:
    5959#endif
    … …  
    8080{
    8181    switch ([event type]) {
    82 #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     82#if defined(__LP64__)
    8383    case NSEventTypePressure:
    8484#endif
    … …  
    111111{
    112112    switch ([event type]) {
    113 #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     113#if defined(__LP64__)
    114114    case NSEventTypePressure:
    115115#endif
    … …  
    724724        m_type = mouseEventTypeForEvent(event);
    725725
    726 #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     726#if defined(__LP64__)
    727727        BOOL eventIsPressureEvent = [event type] == NSEventTypePressure;
    728728        if (eventIsPressureEvent) {
    … …  
    754754
    755755        m_force = 0;
    756 #if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     756#if defined(__LP64__)
    757757        int stage = eventIsPressureEvent ? event.stage : correspondingPressureEvent.stage;
    758758        double pressure = eventIsPressureEvent ? event.pressure : correspondingPressureEvent.pressure;

  • trunk/Source/WebKit/ChangeLog

    r237606 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
     9        (WebKit::NetworkDataTaskCocoa::applySniffingPoliciesAndBindRequestToInferfaceIfNeeded):
     10        * Platform/spi/Cocoa/DeviceIdentitySPI.h:
     11        * Platform/spi/ios/UIKitSPI.h:
     12        * Shared/WebPreferencesDefaultValues.cpp:
     13        (defaultCustomPasteboardDataEnabled):
     14        * UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
     15        (WebKit::toPKPaymentRequest):
     16        * UIProcess/ios/WKContentViewInteraction.mm:
     17        (-[WKContentView changeSelectionWithTouchAt:withSelectionTouch:baseIsStart:]): Deleted.
     18
    1192018-10-30  Commit Queue  <commit-queue@webkit.org>
    220

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

    r237266 r237607  
    8484#if !PLATFORM(MAC)
    8585    UNUSED_PARAM(shouldContentEncodingSniff);
    86 #elif __MAC_OS_X_VERSION_MIN_REQUIRED < 101302
     86#elif __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
    8787    shouldContentEncodingSniff = true;
    8888#endif
    … …  
    9696    auto mutableRequest = adoptNS([nsRequest mutableCopy]);
    9797
    98 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101302
     98#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
    9999    if (!shouldContentEncodingSniff)
    100100        [mutableRequest _setProperty:@(YES) forKey:(NSString *)kCFURLRequestContentDecoderSkipURLCheck];

  • trunk/Source/WebKit/Platform/spi/Cocoa/DeviceIdentitySPI.h

    r237266 r237607  
    3232#if USE(APPLE_INTERNAL_SDK)
    3333
    34 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 110300
    35 extern NSString * _Nonnull const kMAOptionsBAAAccessControls;
    36 #endif
    37 
    3834extern "C" {
    3935#import <DeviceIdentity/DeviceIdentity.h>

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

    r237245 r237607  
    342342@property (nonatomic, getter=_contentScrollInset, setter=_setContentScrollInset:) UIEdgeInsets contentScrollInset;
    343343@property (nonatomic, getter=_indicatorInsetAdjustmentBehavior, setter=_setIndicatorInsetAdjustmentBehavior:) UIScrollViewIndicatorInsetAdjustmentBehavior indicatorInsetAdjustmentBehavior;
    344 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
    345344@property (nonatomic, readonly) UIEdgeInsets _systemContentInset;
    346 #endif
    347345@end
    348346
    … …  
    493491@property (nonatomic, assign, setter=_setBackdropMaskViewFlags:) NSInteger _backdropMaskViewFlags;
    494492- (void)_populateArchivedSubviews:(NSMutableSet *)encodedViews;
    495 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
    496493- (void)safeAreaInsetsDidChange;
    497 #endif
    498494@property (nonatomic, setter=_setContinuousCornerRadius:) CGFloat _continuousCornerRadius;
    499495- (void)insertSubview:(UIView *)view above:(UIView *)sibling;
    … …  
    632628
    633629- (BOOL)hasSelectablePositionAtPoint:(CGPoint)point;
    634 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 110000
    635 - (BOOL)pointIsInAssistedNode:(CGPoint)point;
    636 #endif
    637630- (NSArray *)webSelectionRects;
    638631- (void)_cancelLongPressGestureRecognizer;

  • trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

    r237266 r237607  
    4747bool defaultCustomPasteboardDataEnabled()
    4848{
    49 #if PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300
     49#if PLATFORM(IOS_FAMILY)
    5050    return WebCore::IOSApplication::isMobileSafari() || dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_11_3;
    5151#elif PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300

  • trunk/Source/WebKit/UIProcess/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

    r237266 r237607  
    150150}
    151151
    152 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
     152#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS_FAMILY)
    153153
    154154- (void)paymentAuthorizationViewController:(PKPaymentAuthorizationViewController *)controller didAuthorizePayment:(PKPayment *)payment handler:(void (^)(PKPaymentAuthorizationResult *result))completion
    … …  
    499499#endif
    500500
    501 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) \
    502     || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300)
     501#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
    503502static PKPaymentRequestAPIType toAPIType(WebCore::ApplePaySessionPaymentRequest::Requester requester)
    504503{
    … …  
    527526        [result setThumbnailURL:linkIconURLs[0]];
    528527
    529 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) \
    530     || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300 && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110300)
     528#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101304) || PLATFORM(IOS_FAMILY)
    531529    [result setAPIType:toAPIType(paymentRequest.requester())];
    532530#endif

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

    r237485 r237607  
    28942894    });
    28952895}
    2896 
    2897 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 120000
    2898 - (void)changeSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch baseIsStart:(BOOL)baseIsStart
    2899 {
    2900     [self changeSelectionWithTouchAt:point withSelectionTouch:touch baseIsStart:baseIsStart withFlags:UIWKNone];
    2901 }
    2902 #endif
    29032896
    29042897- (void)changeSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch baseIsStart:(BOOL)baseIsStart withFlags:(UIWKSelectionFlags)flags

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r237606 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebView/WebHTMLView.mm:
     9        (-[WebHTMLView pressureChangeWithEvent:]):
     10        * WebView/WebPDFView.h:
     11
    1122018-10-30  Commit Queue  <commit-queue@webkit.org>
    213

  • trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm

    r237266 r237607  
    44924492- (void)pressureChangeWithEvent:(NSEvent *)event
    44934493{
    4494 #if PLATFORM(MAC) && defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
     4494#if PLATFORM(MAC) && defined(__LP64__)
    44954495    NSEvent *lastPressureEvent = [[self _webView] _pressureEvent];
    44964496    if (event.phase != NSEventPhaseChanged && event.phase != NSEventPhaseBegan && event.phase != NSEventPhaseEnded)

  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h

    r237266 r237607  
    3434@class WebDataSource;
    3535
    36 #if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
    37 @protocol PDFViewDelegate <NSObject>
    38 @end
    39 #endif
    40 
    4136@interface WebPDFView : NSView <PDFViewDelegate, WebDocumentView, WebDocumentSearching, WebDocumentIncrementalSearching, WebMultipleTextMatches, WebDocumentSelection, WebDocumentElement, WebDocumentPDF, _WebDocumentViewState, _WebDocumentZooming>
    4237{

  • trunk/Tools/ChangeLog

    r237584 r237607  
     12018-10-30  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Clean up some obsolete MAX_ALLOWED macros
     4        https://bugs.webkit.org/show_bug.cgi?id=190916
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp:
     9        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
     10        * TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm:
     11
    1122018-10-30  Claudio Saavedra  <csaavedra@igalia.com>
    213

  • trunk/Tools/TestWebKitAPI/Tests/WTF/darwin/WeakLinking.cpp

    r237266 r237607  
    3333#if PLATFORM(IOS_FAMILY)
    3434
    35 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 101000
    3635asm(".linker_option \"-lTestWTFAlwaysMissing-iOS-v2\"");
    37 #else
    38 asm(".linker_option \"-lTestWTFAlwaysMissing-iOS\"");
    39 #endif
    4036
    4137#else
    4238
    43 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
    4439asm(".linker_option \"-lTestWTFAlwaysMissing-macOS-v2\"");
    45 #else
    46 asm(".linker_option \"-lTestWTFAlwaysMissing-macOS\"");
    47 #endif
    4840
    4941#endif

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm

    r237266 r237607  
    405405#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
    406406
    407 // FIXME: This should be removed once <rdar://problem/35344202> is resolved and bots are updated.
    408 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED <= 110102)
     407// FIXME: This #if should be removed once <rdar://problem/35344202> is resolved and bots are updated.
     408#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301
    409409TEST(WebKit, WKHTTPCookieStoreNonPersistent)
    410410{
    … …  
    435435    runTestWithWebsiteDataStore(customDataStore.get());
    436436}
    437 #endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MAX_ALLOWED <= 110102)
     437#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED <= 101301
    438438
    439439TEST(WebKit, CookieObserverCrash)

  • trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm

    r237266 r237607  
    13731373
    13741374// FIXME: Re-enable this test once we resolve <https://bugs.webkit.org/show_bug.cgi?id=175204>
    1375 #if __IPHONE_OS_VERSION_MAX_ALLOWED <= 110401
     1375#if 0
    13761376TEST(DragAndDropTests, CustomActionSheetPopover)
    13771377{
Note: See TracChangeset for help on using the changeset viewer.