Changeset 195526 in webkit

Timestamp:

Jan 24, 2016 11:45:39 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Report upload progress to NetworkLoadClient when using NetworkSession
​https://bugs.webkit.org/show_bug.cgi?id=153388

Patch by Alex Christensen <​achristensen@webkit.org> on 2016-01-24
Reviewed by Darin Adler.

This fixes http/tests/xmlhttprequest/upload-onload-event.html and a few other tests.

• NetworkProcess/NetworkLoad.cpp:

(WebKit::NetworkLoad::didBecomeDownload):
(WebKit::NetworkLoad::didSendData):
(WebKit::NetworkLoad::didReceiveResponseAsync):

• NetworkProcess/NetworkLoad.h:
• NetworkProcess/NetworkSession.h:

(WebKit::NetworkSessionTaskClient::~NetworkSessionTaskClient):

• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(-[WKNetworkSessionDelegate initWithNetworkSession:]):
(-[WKNetworkSessionDelegate URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:]):
(-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkLoad.cpp (modified) (1 diff)
• NetworkProcess/NetworkLoad.h (modified) (1 diff)
• NetworkProcess/NetworkSession.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-24  Alex Christensen  <achristensen@webkit.org>
+
+        Report upload progress to NetworkLoadClient when using NetworkSession
+        https://bugs.webkit.org/show_bug.cgi?id=153388
+
+        Reviewed by Darin Adler.
+
+        This fixes http/tests/xmlhttprequest/upload-onload-event.html and a few other tests.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::didBecomeDownload):
+        (WebKit::NetworkLoad::didSendData):
+        (WebKit::NetworkLoad::didReceiveResponseAsync):
+        * NetworkProcess/NetworkLoad.h:
+        * NetworkProcess/NetworkSession.h:
+        (WebKit::NetworkSessionTaskClient::~NetworkSessionTaskClient):
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (-[WKNetworkSessionDelegate initWithNetworkSession:]):
+        (-[WKNetworkSessionDelegate URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:]):
+        (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
+
 2016-01-24  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp

@@ -242 +242 @@
 }
 
+void NetworkLoad::didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend)
+{
+    m_client.didSendData(totalBytesSent, totalBytesExpectedToSend);
+}
+
 #else
 

trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h

@@ -74 +74 @@
     virtual void didCompleteWithError(const WebCore::ResourceError&) final override;
     virtual void didBecomeDownload() final override;
+    virtual void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override;
 #else
     // ResourceHandleClient

trunk/Source/WebKit2/NetworkProcess/NetworkSession.h

@@ -77 +77 @@
     virtual void didCompleteWithError(const WebCore::ResourceError&) = 0;
     virtual void didBecomeDownload() = 0;
+    virtual void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) = 0;
 
     virtual ~NetworkSessionTaskClient() { }

trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -96 +96 @@
 }
 
+- (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesSent totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend
+{
+    if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier))
+        networkDataTask->client().didSendData(totalBytesSent, totalBytesExpectedToSend);
+}
+
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completionHandler
 {