Title: [262930] trunk
Revision
262930
Author
[email protected]
Date
2020-06-11 16:51:24 -0700 (Thu, 11 Jun 2020)

Log Message

Re-enable download resume tests
https://bugs.webkit.org/show_bug.cgi?id=213098
<rdar://problem/63512518>

Patch by Alex Christensen <[email protected]> on 2020-06-11
Reviewed by Geoffrey Garen.

Source/WebCore/PAL:

* pal/spi/cf/CFNetworkSPI.h:

Source/WebKit:

* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):

Source/WTF:

Workaround is no longer needed because underlying bug has been fixed.

* wtf/PlatformHave.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/Download.mm:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (262929 => 262930)


--- trunk/Source/WTF/ChangeLog	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Source/WTF/ChangeLog	2020-06-11 23:51:24 UTC (rev 262930)
@@ -1,3 +1,15 @@
+2020-06-11  Alex Christensen  <[email protected]>
+
+        Re-enable download resume tests
+        https://bugs.webkit.org/show_bug.cgi?id=213098
+        <rdar://problem/63512518>
+
+        Reviewed by Geoffrey Garen.
+
+        Workaround is no longer needed because underlying bug has been fixed.
+
+        * wtf/PlatformHave.h:
+
 2020-06-11  Jonathan Bedard  <[email protected]>
 
         WebKit: Make UIGestureRecognizer build for watchOS and tvOS

Modified: trunk/Source/WTF/wtf/PlatformHave.h (262929 => 262930)


--- trunk/Source/WTF/wtf/PlatformHave.h	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2020-06-11 23:51:24 UTC (rev 262930)
@@ -409,6 +409,10 @@
 #define HAVE_CFNETWORK_METRICS_CONNECTION_PROPERTIES 1
 #endif
 
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 140000
+#define HAVE_BROKEN_DOWNLOAD_RESUME_UNLINK 1
+#endif
+
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101600) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
 #define HAVE_CFNETWORK_METRICS_APIS_V4 1
 #endif

Modified: trunk/Source/WebCore/PAL/ChangeLog (262929 => 262930)


--- trunk/Source/WebCore/PAL/ChangeLog	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-06-11 23:51:24 UTC (rev 262930)
@@ -1,3 +1,13 @@
+2020-06-11  Alex Christensen  <[email protected]>
+
+        Re-enable download resume tests
+        https://bugs.webkit.org/show_bug.cgi?id=213098
+        <rdar://problem/63512518>
+
+        Reviewed by Geoffrey Garen.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+
 2020-06-10  Said Abou-Hallawa  <[email protected]>
 
         [macOS]: The File Picker of the <input> file element should show the selection filter

Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (262929 => 262930)


--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2020-06-11 23:51:24 UTC (rev 262930)
@@ -442,6 +442,7 @@
 - (void)_setCookiesRemovedHandler:(void(^__nullable)(NSArray<NSHTTPCookie*>* __nullable removedCookies, NSString* __nullable domainForRemovedCookies, bool removeAllCookies))cookiesRemovedHandler onQueue:(dispatch_queue_t __nullable)queue;
 @end
 
+#if HAVE(BROKEN_DOWNLOAD_RESUME_UNLINK)
 @interface __NSCFLocalDownloadFile : NSObject
 @end
 @interface __NSCFLocalDownloadFile ()
@@ -451,6 +452,7 @@
 @interface NSURLSessionDownloadTask ()
 - (__NSCFLocalDownloadFile *)downloadFile;
 @end
+#endif
 
 @interface NSURLResponse ()
 - (void)_setMIMEType:(NSString *)type;

Modified: trunk/Source/WebKit/ChangeLog (262929 => 262930)


--- trunk/Source/WebKit/ChangeLog	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Source/WebKit/ChangeLog	2020-06-11 23:51:24 UTC (rev 262930)
@@ -1,3 +1,14 @@
+2020-06-11  Alex Christensen  <[email protected]>
+
+        Re-enable download resume tests
+        https://bugs.webkit.org/show_bug.cgi?id=213098
+        <rdar://problem/63512518>
+
+        Reviewed by Geoffrey Garen.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):
+
 2020-06-11  Beth Dakin  <[email protected]>
 
         Replace instances of whitelist in WebCore with allowlist

Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (262929 => 262930)


--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2020-06-11 23:51:24 UTC (rev 262930)
@@ -963,7 +963,7 @@
 
 - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes
 {
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(BROKEN_DOWNLOAD_RESUME_UNLINK)
     // This is to work around rdar://problem/63249830
     if ([downloadTask respondsToSelector:@selector(downloadFile)] && [downloadTask.downloadFile respondsToSelector:@selector(setSkipUnlink:)])
         downloadTask.downloadFile.skipUnlink = YES;

Modified: trunk/Tools/ChangeLog (262929 => 262930)


--- trunk/Tools/ChangeLog	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Tools/ChangeLog	2020-06-11 23:51:24 UTC (rev 262930)
@@ -1,3 +1,13 @@
+2020-06-11  Alex Christensen  <[email protected]>
+
+        Re-enable download resume tests
+        https://bugs.webkit.org/show_bug.cgi?id=213098
+        <rdar://problem/63512518>
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
+
 2020-06-11  Commit Queue  <[email protected]>
 
         Unreviewed, reverting r262696.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm (262929 => 262930)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm	2020-06-11 23:43:44 UTC (rev 262929)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm	2020-06-11 23:51:24 UTC (rev 262930)
@@ -1160,8 +1160,7 @@
     Util::run(&isDone);
 }
 
-// FIXME: Enable this everywhere once rdar://problem/63249830 or rdar://problem/63512518 is fixed.
-#if HAVE(NETWORK_FRAMEWORK) && (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 140000))
+#if HAVE(NETWORK_FRAMEWORK)
 
 template<size_t length>
 String longString(LChar c)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to