Changeset 224786 in webkit

Timestamp:

Nov 13, 2017, 3:00:38 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Call willPerformHTTPRedirection on WebCoreNSURLSession's delegate
​https://bugs.webkit.org/show_bug.cgi?id=179539

Reviewed by Jer Noble.

This is now possible!
This will allow AVFoundation to fix redirect-related bugs.

• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSession addDelegateOperation:]):
(-[WebCoreNSURLSession resetWithCompletionHandler:]):
(-[WebCoreNSURLSession flushWithCompletionHandler:]):
(WebCore::WebCoreNSURLSessionDataTaskClient::redirectReceived):
(-[WebCoreNSURLSessionDataTask resource:shouldCacheResponse:]):
(-[WebCoreNSURLSessionDataTask resource:receivedData:length:]):
(-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:completionHandler:]):
(-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:]): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cocoa/WebCoreNSURLSession.mm (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-13  Alex Christensen  <achristensen@webkit.org>
+
+        Call willPerformHTTPRedirection on WebCoreNSURLSession's delegate
+        https://bugs.webkit.org/show_bug.cgi?id=179539
+
+        Reviewed by Jer Noble.
+
+        This is now possible!
+        This will allow AVFoundation to fix redirect-related bugs.
+
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSession addDelegateOperation:]):
+        (-[WebCoreNSURLSession resetWithCompletionHandler:]):
+        (-[WebCoreNSURLSession flushWithCompletionHandler:]):
+        (WebCore::WebCoreNSURLSessionDataTaskClient::redirectReceived):
+        (-[WebCoreNSURLSessionDataTask resource:shouldCacheResponse:]):
+        (-[WebCoreNSURLSessionDataTask resource:receivedData:length:]):
+        (-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:completionHandler:]):
+        (-[WebCoreNSURLSessionDataTask resource:receivedRedirect:request:]): Deleted.
+
 2017-11-13  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm

@@ -30 +30 @@
 #import "PlatformMediaResourceLoader.h"
 #import "SubresourceLoader.h"
+#import <wtf/BlockPtr.h>
 #import <wtf/CompletionHandler.h>
 
@@ -42 +43 @@
 @property (readwrite, retain) id<NSURLSessionTaskDelegate> delegate;
 - (void)taskCompleted:(WebCoreNSURLSessionDataTask *)task;
-- (void)addDelegateOperation:(void (^)(void))operation;
+- (void)addDelegateOperation:(Function<void()>&&)operation;
 - (void)task:(WebCoreNSURLSessionDataTask *)task didReceiveCORSAccessCheckResult:(BOOL)result;
 @end
@@ -59 +60 @@
 - (BOOL)resource:(PlatformMediaResource&)resource shouldCacheResponse:(const ResourceResponse&)response;
 - (void)resource:(PlatformMediaResource&)resource receivedData:(const char*)data length:(int)length;
-- (void)resource:(PlatformMediaResource&)resource receivedRedirect:(const ResourceResponse&)response request:(ResourceRequest&)request;
+- (void)resource:(PlatformMediaResource&)resource receivedRedirect:(const ResourceResponse&)response request:(ResourceRequest&&)request completionHandler:(CompletionHandler<void(ResourceRequest&&)>&&)completionHandler;
 - (void)resource:(PlatformMediaResource&)resource accessControlCheckFailedWithError:(const ResourceError&)error;
 - (void)resource:(PlatformMediaResource&)resource loadFailedWithError:(const ResourceError&)error;
@@ -128 +129 @@
 }
 
-- (void)addDelegateOperation:(void (^)(void))block
+- (void)addDelegateOperation:(Function<void()>&&)function
 {
     RetainPtr<WebCoreNSURLSession> strongSelf { self };
-    RetainPtr<NSBlockOperation> operation = [NSBlockOperation blockOperationWithBlock:block];
+    RetainPtr<NSBlockOperation> operation = [NSBlockOperation blockOperationWithBlock:BlockPtr<void()>::fromCallable(WTFMove(function)).get()];
     dispatch_async(_internalQueue.get(), [strongSelf, operation] {
         [strongSelf.get().delegateQueue addOperation:operation.get()];
@@ -217 +218 @@
 {
     // FIXME: This cannot currently be implemented. We cannot guarantee that the next connection will happen on a new socket.
-    [self addDelegateOperation:completionHandler];
+    [self addDelegateOperation:[completionHandler = BlockPtr<void()>(completionHandler)] {
+        completionHandler();
+    }];
 }
 
@@ -223 +226 @@
 {
     // FIXME: This cannot currently be implemented. We cannot guarantee that the next connection will happen on a new socket.
-    [self addDelegateOperation:completionHandler];
+    [self addDelegateOperation:[completionHandler = BlockPtr<void()>(completionHandler)] {
+        completionHandler();
+    }];
 }
 
@@ -385 +390 @@
 void WebCoreNSURLSessionDataTaskClient::redirectReceived(PlatformMediaResource& resource, ResourceRequest&& request, const ResourceResponse& response, CompletionHandler<void(ResourceRequest&&)>&& completionHandler)
 {
-    [m_task resource:resource receivedRedirect:response request:request];
-    completionHandler(WTFMove(request));
+    [m_task resource:resource receivedRedirect:response request:WTFMove(request) completionHandler:WTFMove(completionHandler)];
 }
 
@@ -588 +592 @@
 {
     ASSERT_UNUSED(resource, &resource == _resource);
-    UNUSED_PARAM(response);
 
     ASSERT(isMainThread());
@@ -599 +602 @@
 {
     ASSERT_UNUSED(resource, &resource == _resource);
-    UNUSED_PARAM(data);
-    UNUSED_PARAM(length);
     RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:data length:length]);
     RetainPtr<WebCoreNSURLSessionDataTask> strongSelf { self };
@@ -611 +612 @@
 }
 
-- (void)resource:(PlatformMediaResource&)resource receivedRedirect:(const ResourceResponse&)response request:(ResourceRequest&)request
+- (void)resource:(PlatformMediaResource&)resource receivedRedirect:(const ResourceResponse&)response request:(ResourceRequest&&)request completionHandler:(CompletionHandler<void(ResourceRequest&&)>&&)completionHandler
 {
     ASSERT_UNUSED(resource, &resource == _resource);
-    UNUSED_PARAM(response);
-    UNUSED_PARAM(request);
-    // FIXME: This cannot currently be implemented, as the callback is synchronous
-    // on the main thread, and the NSURLSession delegate must be called back on a
-    // background queue, and we do not want to block the main thread until the
-    // delegate handles the callback and responds via a completion handler. If, in
-    // the future, the ResourceLoader exposes a callback-based willSendResponse
-    // API, this can be implemented.
+    [self.session addDelegateOperation:[strongSelf = retainPtr(self), response = retainPtr(response.nsURLResponse()), request = WTFMove(request), completionHandler = WTFMove(completionHandler)] () mutable {
+        if (![response isKindOfClass:[NSHTTPURLResponse class]]) {
+            ASSERT_NOT_REACHED();
+            return completionHandler(WTFMove(request));
+        }
+        
+        id<NSURLSessionDataDelegate> dataDelegate = (id<NSURLSessionDataDelegate>)strongSelf.get().session.delegate;
+        if ([dataDelegate respondsToSelector:@selector(URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:)]) {
+            auto completionHandlerBlock = BlockPtr<void(NSURLRequest *)>::fromCallable([completionHandler = WTFMove(completionHandler)](NSURLRequest *newRequest) mutable {
+                completionHandler(newRequest);
+            });
+            [dataDelegate URLSession:(NSURLSession *)strongSelf.get().session task:(NSURLSessionTask *)strongSelf.get() willPerformHTTPRedirection:(NSHTTPURLResponse *)response.get() newRequest:request.nsURLRequest(DoNotUpdateHTTPBody) completionHandler:completionHandlerBlock.get()];
+        } else
+            completionHandler(WTFMove(request));
+    }];
 }