Diff
Modified: trunk/Source/WTF/ChangeLog (255454 => 255455)
--- trunk/Source/WTF/ChangeLog 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WTF/ChangeLog 2020-01-30 21:36:37 UTC (rev 255455)
@@ -1,3 +1,12 @@
+2020-01-30 Jonathan Bedard <[email protected]>
+
+ PAL: Remove old iOS version macros
+ https://bugs.webkit.org/show_bug.cgi?id=206905
+
+ Reviewed by Darin Adler.
+
+ * wtf/PlatformHave.h: Add HAVE(NSPROGRESS_PUBLISHING_SPI).
+
2020-01-28 Carlos Garcia Campos <[email protected]>
[GTK] Should use light theme unless website declares support for dark themes in color-schemes property
Modified: trunk/Source/WTF/wtf/PlatformHave.h (255454 => 255455)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -574,3 +574,7 @@
#if PLATFORM(COCOA) && !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101400) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
#define HAVE_CG_PATH_UNEVEN_CORNERS_ROUNDEDRECT 1
#endif
+
+#if PLATFORM(WATCHOS) || PLATFORM(APPLETV) || (PLATFORM(IOS_FAMILY) && !(defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)))
+#define HAVE_NSPROGRESS_PUBLISHING_SPI 1
+#endif
Modified: trunk/Source/WebCore/ChangeLog (255454 => 255455)
--- trunk/Source/WebCore/ChangeLog 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/ChangeLog 2020-01-30 21:36:37 UTC (rev 255455)
@@ -1,3 +1,15 @@
+2020-01-30 Jonathan Bedard <[email protected]>
+
+ PAL: Remove old iOS version macros
+ https://bugs.webkit.org/show_bug.cgi?id=206905
+
+ Reviewed by Darin Adler.
+
+ No functional changes, covered by existing tests.
+
+ * loader/archive/cf/LegacyWebArchiveMac.mm: Remove USE(SECURE_ARCHIVER_API).
+ * testing/cocoa/WebArchiveDumpSupport.mm: Ditto.
+
2020-01-30 Doug Kelly <[email protected]>
Crash in RenderElement::selectionPseudoStyle with detail element set to display: contents
Modified: trunk/Source/WebCore/PAL/ChangeLog (255454 => 255455)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-01-30 21:36:37 UTC (rev 255455)
@@ -1,3 +1,20 @@
+2020-01-30 Jonathan Bedard <[email protected]>
+
+ PAL: Remove old iOS version macros
+ https://bugs.webkit.org/show_bug.cgi?id=206905
+
+ Reviewed by Darin Adler.
+
+ * pal/cocoa/AVFoundationSoftLink.mm: Remove iOS 13 version checks.
+ * pal/spi/cf/CFNetworkSPI.h: Remove iOS 11 version checks.
+ * pal/spi/cg/CoreGraphicsSPI.h: Use HAVE macro instead of version checks.
+ * pal/spi/cocoa/IOSurfaceSPI.h: Remove iOS 11 version checks.
+ * pal/spi/cocoa/NSKeyedArchiverSPI.h: Remove USE(SECURE_ARCHIVER_API) and
+ USE(SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING).
+ * pal/spi/cocoa/NSProgressSPI.h: Replace USE(NSPROGRESS_PUBLISHING_SPI) with
+ HAVE(NSPROGRESS_PUBLISHING_SPI).
+ * pal/spi/ios/MediaPlayerSPI.h: Remove iOS 11 version checks.
+
2020-01-30 Ryan Haddad <[email protected]>
Unreviewed, rolling out r255424.
Modified: trunk/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm 2020-01-30 21:36:37 UTC (rev 255455)
@@ -30,7 +30,7 @@
#import <AVFoundation/AVFoundation.h>
#import <wtf/SoftLinking.h>
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
+#if !(PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
SOFT_LINK_FRAMEWORK_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, PAL_EXPORT)
#else
@interface AVPlayerItem (DisableKVOOnSupressesVideoLayers)
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -213,7 +213,7 @@
@property (nullable, readwrite, retain) NSURL *_siteForCookies;
@property (readwrite) BOOL _isTopLevelNavigation;
#endif
-#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if PLATFORM(COCOA) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
@property (nonatomic, assign) BOOL _preconnect;
#endif
@end
Modified: trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -282,7 +282,7 @@
void CGContextDrawConicGradient(CGContextRef, CGGradientRef, CGPoint center, CGFloat angle);
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+#if HAVE(CG_PATH_UNEVEN_CORNERS_ROUNDEDRECT)
void CGPathAddUnevenCornersRoundedRect(CGMutablePathRef, const CGAffineTransform *, CGRect, const CGSize corners[4]);
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/IOSurfaceSPI.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -103,7 +103,7 @@
#else
-#if __IPHONE_OS_VERSION_MIN_REQUIRED < 110000
+#if PLATFORM(WATCHOS) || PLATFORM(APPLETV)
typedef uint32_t IOSurfaceID;
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/NSKeyedArchiverSPI.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -29,11 +29,6 @@
#import <wtf/Assertions.h>
#import <wtf/RetainPtr.h>
-#define USE_SECURE_ARCHIVER_API (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110200) || PLATFORM(WATCHOS) || PLATFORM(APPLETV))
-
-#define USE_SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV))
-
-#if USE(SECURE_ARCHIVER_API)
#if USE(APPLE_INTERNAL_SDK)
#import <Foundation/NSKeyedArchiver_Private.h>
#else
@@ -56,32 +51,23 @@
NS_ASSUME_NONNULL_END
#endif /* USE(APPLE_INTERNAL_SDK) */
-#endif /* USE(SECURE_ARCHIVER_API) */
inline NSData *_Nullable securelyArchivedDataWithRootObject(id _Nonnull object)
{
-#if USE(SECURE_ARCHIVER_API)
NSError *error;
NSData *data = "" archivedDataWithRootObject:object requiringSecureCoding:YES error:&error];
if (!data)
LOG_ERROR("Unable to archive data: %@", error);
return data;
-#else
- return [NSKeyedArchiver archivedDataWithRootObject:object];
-#endif
}
inline NSData *_Nullable insecurelyArchivedDataWithRootObject(id _Nonnull object)
{
-#if USE(SECURE_ARCHIVER_API)
NSError *error;
NSData *data = "" archivedDataWithRootObject:object requiringSecureCoding:NO error:&error];
if (!data)
LOG_ERROR("Unable to archive data: %@", error);
return data;
-#else
- return [NSKeyedArchiver archivedDataWithRootObject:object];
-#endif
}
inline id _Nullable insecurelyUnarchiveObjectFromData(NSData * _Nonnull data)
@@ -93,52 +79,27 @@
inline id _Nullable unarchivedObjectOfClassesFromData(NSSet<Class> * _Nonnull classes, NSData * _Nonnull data)
{
-#if USE(SECURE_ARCHIVER_API)
-#if !USE(SECURE_ARCHIVER_FOR_ATTRIBUTED_STRING)
- // Remove this code when the fix from <rdar://problem/31376830> is deployed to all relevant build targets.
- if ([classes containsObject:[NSAttributedString class]])
- return insecurelyUnarchiveObjectFromData(data);
-#endif
NSError *error;
id value = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:data error:&error];
if (!value)
LOG_ERROR("Unable to unarchive data: %@", error);
return value;
-#else
- UNUSED_PARAM(classes);
- return insecurelyUnarchiveObjectFromData(data);
-#endif
}
inline RetainPtr<NSKeyedArchiver> secureArchiver()
{
-#if USE(SECURE_ARCHIVER_API)
NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initRequiringSecureCoding:YES];
-#else
- NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] init];
- [archiver setRequiresSecureCoding:YES];
-#endif
return adoptNS(archiver);
}
inline RetainPtr<NSKeyedUnarchiver> secureUnarchiverFromData(NSData *_Nonnull data)
{
-#if USE(SECURE_ARCHIVER_API)
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:data error:nil];
unarchiver.decodingFailurePolicy = NSDecodingFailurePolicyRaiseException;
-#else
- NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
- [unarchiver setRequiresSecureCoding:YES];
-#endif
return adoptNS(unarchiver);
}
inline id _Nullable decodeObjectOfClassForKeyFromCoder(Class _Nonnull cls, NSString * _Nonnull key, NSCoder * _Nonnull coder)
{
-#if USE(SECURE_ARCHIVER_API)
return [coder decodeObjectOfClass:cls forKey:key];
-#else
- UNUSED_PARAM(cls);
- return [coder decodeObjectForKey:key];
-#endif
}
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/NSProgressSPI.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -27,15 +27,12 @@
#if USE(APPLE_INTERNAL_SDK)
-#define USE_NSPROGRESS_PUBLISHING_SPI PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
#import <Foundation/NSProgress_Private.h>
#else
-#define USE_NSPROGRESS_PUBLISHING_SPI PLATFORM(IOS_FAMILY) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
-#if USE_NSPROGRESS_PUBLISHING_SPI
-
@interface NSProgress ()
- (void)_publish;
@@ -45,6 +42,6 @@
@end
-#endif // USE_NSPROGRESS_PUBLISHING_SPI
+#endif // HAVE(NSPROGRESS_PUBLISHING_SPI)
#endif // not USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h (255454 => 255455)
--- trunk/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/MediaPlayerSPI.h 2020-01-30 21:36:37 UTC (rev 255455)
@@ -34,11 +34,11 @@
#import <MediaPlayer/MPAVRoutingController.h>
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
#import <MediaPlayer/MPMediaControlsConfiguration.h>
#endif
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
#import <MediaPlayer/MPMediaControlsViewController.h>
#else
#import <MediaPlayer/MPAVRoutingSheet.h>
@@ -64,7 +64,7 @@
@property (nonatomic, assign) MPRouteDiscoveryMode discoveryMode;
@end
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000 && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
@interface MPMediaControlsViewController : UIViewController
@property (nonatomic, copy, nullable) void (^didDismissHandler)(void);
Modified: trunk/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm (255454 => 255455)
--- trunk/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/loader/archive/cf/LegacyWebArchiveMac.mm 2020-01-30 21:36:37 UTC (rev 255455)
@@ -44,18 +44,9 @@
return ResourceResponse();
NSURLResponse *response = nil;
-#if USE(SECURE_ARCHIVER_API)
auto unarchiver = secureUnarchiverFromData((__bridge NSData *)responseData);
@try {
response = [unarchiver decodeObjectOfClass:[NSURLResponse class] forKey:LegacyWebArchiveResourceResponseKey];
-#else
- // Because of <rdar://problem/34063313> we can't use secure coding for decoding in older OS's.
- auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData]);
- @try {
- id responseObject = [unarchiver decodeObjectForKey:LegacyWebArchiveResourceResponseKey];
- if ([responseObject isKindOfClass:[NSURLResponse class]])
- response = responseObject;
-#endif
[unarchiver finishDecoding];
} @catch (NSException *exception) {
LOG_ERROR("Failed to decode NS(HTTP)URLResponse: %@", exception);
@@ -72,19 +63,9 @@
if (!nsResponse)
return nullptr;
-#if USE(SECURE_ARCHIVER_API)
auto archiver = secureArchiver();
[archiver encodeObject:nsResponse forKey:LegacyWebArchiveResourceResponseKey];
- return retainPtr((__bridge CFDataRef)archiver.get().encodedData);
-#else
- // Because of <rdar://problem/34063313> we can't use this for encoding in older OS's.
- CFMutableDataRef responseData = CFDataCreateMutable(0, 0);
- auto archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:(NSMutableData *)responseData]);
- [archiver encodeObject:nsResponse forKey:LegacyWebArchiveResourceResponseKey];
- [archiver finishEncoding];
-
- return adoptCF(responseData);
-#endif
+ return (__bridge CFDataRef)archiver.get().encodedData;
}
}
Modified: trunk/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm (255454 => 255455)
--- trunk/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebCore/testing/cocoa/WebArchiveDumpSupport.mm 2020-01-30 21:36:37 UTC (rev 255455)
@@ -43,16 +43,9 @@
static CFURLResponseRef createCFURLResponseFromResponseData(CFDataRef responseData)
{
NSURLResponse *response;
-#if USE(SECURE_ARCHIVER_API)
auto unarchiver = secureUnarchiverFromData((__bridge NSData *)responseData);
@try {
response = [unarchiver decodeObjectOfClass:[NSURLResponse class] forKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
-#else
- // Because of <rdar://problem/34063313> we can't use secure coding for decoding in older OS's.
- auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:(NSData *)responseData]);
- @try {
- response = [unarchiver decodeObjectForKey:@"WebResourceResponse"]; // WebResourceResponseKey in WebResource.m
-#endif
[unarchiver finishDecoding];
} @catch (NSException *exception) {
LOG_ERROR("Failed to decode NS(HTTP)URLResponse: %@", exception);
Modified: trunk/Source/WebKit/ChangeLog (255454 => 255455)
--- trunk/Source/WebKit/ChangeLog 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebKit/ChangeLog 2020-01-30 21:36:37 UTC (rev 255455)
@@ -1,3 +1,13 @@
+2020-01-30 Jonathan Bedard <[email protected]>
+
+ PAL: Remove old iOS version macros
+ https://bugs.webkit.org/show_bug.cgi?id=206905
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/Downloads/cocoa/DownloadCocoa.mm: Remove USE(NSPROGRESS_PUBLISHING_SPI)
+ * NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm: Ditto.
+
2020-01-30 youenn fablet <[email protected]>
Disable Service Workers before terminating an unresponsive service worker process
Modified: trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm (255454 => 255455)
--- trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm 2020-01-30 21:36:37 UTC (rev 255455)
@@ -95,7 +95,7 @@
void Download::platformDestroyDownload()
{
if (m_progress)
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
[m_progress _unpublish];
#else
[m_progress unpublish];
@@ -114,7 +114,7 @@
return;
m_progress = adoptNS([[WKDownloadProgress alloc] initWithDownloadTask:m_downloadTask.get() download:*this URL:(NSURL *)url sandboxExtension:sandboxExtension]);
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
[m_progress _publish];
#else
[m_progress publish];
Modified: trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm (255454 => 255455)
--- trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Source/WebKit/NetworkProcess/Downloads/cocoa/WKDownloadProgress.mm 2020-01-30 21:36:37 UTC (rev 255455)
@@ -80,7 +80,7 @@
return self;
}
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
- (void)_publish
#else
- (void)publish
@@ -89,7 +89,7 @@
BOOL consumedExtension = m_sandboxExtension->consume();
ASSERT_UNUSED(consumedExtension, consumedExtension);
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
[super _publish];
#else
[super publish];
@@ -96,13 +96,13 @@
#endif
}
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
- (void)_unpublish
#else
- (void)unpublish
#endif
{
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
[super _unpublish];
#else
[super unpublish];
Modified: trunk/Tools/ChangeLog (255454 => 255455)
--- trunk/Tools/ChangeLog 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Tools/ChangeLog 2020-01-30 21:36:37 UTC (rev 255455)
@@ -1,5 +1,15 @@
2020-01-30 Jonathan Bedard <[email protected]>
+ PAL: Remove old iOS version macros
+ https://bugs.webkit.org/show_bug.cgi?id=206905
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm: Remove USE(NSPROGRESS_PUBLISHING_SPI)
+ with HAVE(NSPROGRESS_PUBLISHING_SPI)
+
+2020-01-30 Jonathan Bedard <[email protected]>
+
TestWebKitAPI: Re-baseline AccessibilityTests for Catalyst
https://bugs.webkit.org/show_bug.cgi?id=206997
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm (255454 => 255455)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm 2020-01-30 21:35:32 UTC (rev 255454)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DownloadProgress.mm 2020-01-30 21:36:37 UTC (rev 255455)
@@ -173,7 +173,7 @@
}
if (m_progressSubscriber) {
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
[NSProgress _removeSubscriber:m_progressSubscriber.get()];
#else
[NSProgress removeSubscriber:m_progressSubscriber.get()];
@@ -216,7 +216,7 @@
return static_cast<NSProgressUnpublishingHandler>(nil);
});
-#if USE(NSPROGRESS_PUBLISHING_SPI)
+#if HAVE(NSPROGRESS_PUBLISHING_SPI)
m_progressSubscriber = [NSProgress _addSubscriberForFileURL:m_progressURL.get() withPublishingHandler:publishingHandler.get()];
#else
m_progressSubscriber = [NSProgress addSubscriberForFileURL:m_progressURL.get() withPublishingHandler:publishingHandler.get()];
