Title: [262084] trunk
- Revision
- 262084
- Author
- [email protected]
- Date
- 2020-05-22 15:43:39 -0700 (Fri, 22 May 2020)
Log Message
Make download resume workaround forgiving of changes in CFNetwork
https://bugs.webkit.org/show_bug.cgi?id=212273
Patch by Alex Christensen <[email protected]> on 2020-05-22
Reviewed by Geoffrey Garen.
Source/WebCore/PAL:
* pal/spi/cf/CFNetworkSPI.h:
Source/WebKit:
They broke my workaround. See rdar://problem/63512518
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):
Tools:
* TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/PAL/ChangeLog (262083 => 262084)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-05-22 22:31:13 UTC (rev 262083)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-05-22 22:43:39 UTC (rev 262084)
@@ -1,3 +1,12 @@
+2020-05-22 Alex Christensen <[email protected]>
+
+ Make download resume workaround forgiving of changes in CFNetwork
+ https://bugs.webkit.org/show_bug.cgi?id=212273
+
+ Reviewed by Geoffrey Garen.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2020-05-22 Andy Estes <[email protected]>
[Apple Pay] Add new ApplePayInstallmentConfiguration members
Modified: trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (262083 => 262084)
--- trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-05-22 22:31:13 UTC (rev 262083)
+++ trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-05-22 22:43:39 UTC (rev 262084)
@@ -425,7 +425,7 @@
- (void)_setCookiesRemovedHandler:(void(^__nullable)(NSArray<NSHTTPCookie*>* __nullable removedCookies, NSString* __nullable domainForRemovedCookies, bool removeAllCookies))cookiesRemovedHandler onQueue:(dispatch_queue_t __nullable)queue;
@end
-@interface __NSCFLocalDownloadFile
+@interface __NSCFLocalDownloadFile : NSObject
@end
@interface __NSCFLocalDownloadFile ()
@property (readwrite, assign) BOOL skipUnlink;
Modified: trunk/Source/WebKit/ChangeLog (262083 => 262084)
--- trunk/Source/WebKit/ChangeLog 2020-05-22 22:31:13 UTC (rev 262083)
+++ trunk/Source/WebKit/ChangeLog 2020-05-22 22:43:39 UTC (rev 262084)
@@ -1,3 +1,15 @@
+2020-05-22 Alex Christensen <[email protected]>
+
+ Make download resume workaround forgiving of changes in CFNetwork
+ https://bugs.webkit.org/show_bug.cgi?id=212273
+
+ Reviewed by Geoffrey Garen.
+
+ They broke my workaround. See rdar://problem/63512518
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):
+
2020-05-22 Wenson Hsieh <[email protected]>
[IPC] Add support for specifying `Async WantsConnection` in message files
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (262083 => 262084)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-05-22 22:31:13 UTC (rev 262083)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-05-22 22:43:39 UTC (rev 262084)
@@ -957,7 +957,8 @@
{
#if PLATFORM(IOS_FAMILY)
// This is to work around rdar://problem/63249830
- downloadTask.downloadFile.skipUnlink = YES;
+ if ([downloadTask respondsToSelector:@selector(downloadFile)] && [downloadTask.downloadFile respondsToSelector:@selector(setSkipUnlink:)])
+ downloadTask.downloadFile.skipUnlink = YES;
#endif
}
Modified: trunk/Tools/ChangeLog (262083 => 262084)
--- trunk/Tools/ChangeLog 2020-05-22 22:31:13 UTC (rev 262083)
+++ trunk/Tools/ChangeLog 2020-05-22 22:43:39 UTC (rev 262084)
@@ -1,3 +1,12 @@
+2020-05-22 Alex Christensen <[email protected]>
+
+ Make download resume workaround forgiving of changes in CFNetwork
+ https://bugs.webkit.org/show_bug.cgi?id=212273
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
+
2020-05-22 Paulo Matos <[email protected]>
Add support for [no-]use-ccache option in build-jsc
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm (262083 => 262084)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2020-05-22 22:31:13 UTC (rev 262083)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm 2020-05-22 22:43:39 UTC (rev 262084)
@@ -1160,7 +1160,8 @@
Util::run(&isDone);
}
-#if HAVE(NETWORK_FRAMEWORK)
+// 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))
template<size_t length>
String longString(LChar c)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes