[webkit-changes] [147568] trunk/Source/WebKit2

Wed, 03 Apr 2013 11:21:41 -0700

Title: [147568] trunk/Source/WebKit2
Revision
147568
Author
[email protected]
Date
2013-04-03 11:23:34 -0700 (Wed, 03 Apr 2013)

Log Message

        [WK2] XMLHttpRequest upload events don't work with NetworkProcess
        https://bugs.webkit.org/show_bug.cgi?id=113887

        Reviewed by Brady Eidson.

        Just forward didSendData client call to WebProcess.

        * NetworkProcess/NetworkResourceLoader.cpp:
        (WebKit::NetworkResourceLoader::didSendData):
        (WebKit::NetworkResourceLoader::didCancelAuthenticationChallenge): Tweaked a comment.
        * WebProcess/Network/WebResourceLoader.cpp:
        (WebKit::WebResourceLoader::didSendData):
        * WebProcess/Network/WebResourceLoader.h:
        * WebProcess/Network/WebResourceLoader.messages.in:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (147567 => 147568)


--- trunk/Source/WebKit2/ChangeLog	2013-04-03 18:12:40 UTC (rev 147567)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-03 18:23:34 UTC (rev 147568)
@@ -1,3 +1,20 @@
+2013-04-03  Alexey Proskuryakov  <[email protected]>
+
+        [WK2] XMLHttpRequest upload events don't work with NetworkProcess
+        https://bugs.webkit.org/show_bug.cgi?id=113887
+
+        Reviewed by Brady Eidson.
+
+        Just forward didSendData client call to WebProcess.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didSendData):
+        (WebKit::NetworkResourceLoader::didCancelAuthenticationChallenge): Tweaked a comment.
+        * WebProcess/Network/WebResourceLoader.cpp:
+        (WebKit::WebResourceLoader::didSendData):
+        * WebProcess/Network/WebResourceLoader.h:
+        * WebProcess/Network/WebResourceLoader.messages.in:
+
 2013-04-02  Ryosuke Niwa  <[email protected]>
 
         Remove code for Mac 10.5 and earlier from WTF and WebKit2

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (147567 => 147568)


--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2013-04-03 18:12:40 UTC (rev 147567)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2013-04-03 18:23:34 UTC (rev 147568)
@@ -277,14 +277,14 @@
     m_suggestedRequestForWillSendRequest = ResourceRequest();
 }
 
+void NetworkResourceLoader::didSendData(ResourceHandle*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
+{
+    send(Messages::WebResourceLoader::DidSendData(bytesSent, totalBytesToBeSent));
+}
+
 // FIXME (NetworkProcess): Many of the following ResourceHandleClient methods definitely need implementations. A few will not.
 // Once we know what they are they can be removed.
 
-void NetworkResourceLoader::didSendData(ResourceHandle*, unsigned long long /*bytesSent*/, unsigned long long /*totalBytesToBeSent*/)
-{
-    notImplemented();
-}
-
 void NetworkResourceLoader::didReceiveCachedMetadata(ResourceHandle*, const char*, int)
 {
     notImplemented();
@@ -322,7 +322,8 @@
 
 void NetworkResourceLoader::didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge)
 {
-    // FIXME (NetworkProcess): Tell AuthenticationManager.
+    // This function is probably not needed (see <rdar://problem/8960124>).
+    notImplemented();
 }
 
 #if USE(PROTECTION_SPACE_AUTH_CALLBACK)

Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (147567 => 147568)


--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp	2013-04-03 18:12:40 UTC (rev 147567)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp	2013-04-03 18:23:34 UTC (rev 147568)
@@ -93,6 +93,11 @@
     send(Messages::NetworkResourceLoader::ContinueWillSendRequest(newRequest));
 }
 
+void WebResourceLoader::didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
+{
+    m_coreLoader->didSendData(bytesSent, totalBytesToBeSent);
+}
+
 void WebResourceLoader::didReceiveResponseWithCertificateInfo(const ResourceResponse& response, const PlatformCertificateInfo& certificateInfo)
 {
     LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResponseWithCertificateInfo for '%s'. Status %d.", m_coreLoader->url().string().utf8().data(), response.httpStatusCode());

Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (147567 => 147568)


--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h	2013-04-03 18:12:40 UTC (rev 147567)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h	2013-04-03 18:23:34 UTC (rev 147568)
@@ -75,6 +75,7 @@
     void cancelResourceLoader();
 
     void willSendRequest(const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
+    void didSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent);
     void didReceiveResponseWithCertificateInfo(const WebCore::ResourceResponse&, const PlatformCertificateInfo&);
     void didReceiveData(const CoreIPC::DataReference&, int64_t encodedDataLength);
     void didFinishResourceLoad(double finishTime);

Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in (147567 => 147568)


--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in	2013-04-03 18:12:40 UTC (rev 147567)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in	2013-04-03 18:23:34 UTC (rev 147568)
@@ -26,6 +26,7 @@
 
     // FIXME (NetworkProcess): We'll need much more granularity for response messages.
     WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
+    DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
     DidReceiveResponseWithCertificateInfo(WebCore::ResourceResponse response, WebKit::PlatformCertificateInfo certificateInfo)
     DidReceiveData(CoreIPC::DataReference data, int64_t encodedDataLength)
     DidFinishResourceLoad(double finishTime)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to