Changeset 161625 in webkit

Timestamp:

Jan 10, 2014 1:11:00 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Implement NetworkResourceLoader::receivedCancellation
​https://bugs.webkit.org/show_bug.cgi?id=126129

Reviewed Alexey Proskuryakov.

Implement ResourceHandleClient::receivedCancellation() in the
network process to cancel the load when cancellation is received
from the authentication manager like the web process does.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::receivedCancellation): Cancel the load.

• NetworkProcess/NetworkResourceLoader.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-01-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Implement NetworkResourceLoader::receivedCancellation
+        https://bugs.webkit.org/show_bug.cgi?id=126129
+
+        Reviewed Alexey Proskuryakov.
+
+        Implement ResourceHandleClient::receivedCancellation() in the
+        network process to cancel the load when cancellation is received
+        from the authentication manager like the web process does.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::receivedCancellation): Cancel the load.
+        * NetworkProcess/NetworkResourceLoader.h:
+
 2014-01-09  Jinwoo Song  <jinwoo7.song@samsung.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -337 +337 @@
 }
 
+void NetworkResourceLoader::receivedCancellation(ResourceHandle* handle, const AuthenticationChallenge& challenge)
+{
+    ASSERT_UNUSED(handle, handle == m_handle);
+
+    m_handle->cancel();
+    didFail(m_handle.get(), cancelledError(m_request));
+}
+
 IPC::Connection* NetworkResourceLoader::messageSenderConnection()
 {

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

@@ -93 +93 @@
     virtual void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
     virtual void didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
+    virtual void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
     virtual bool usesAsyncCallbacks() OVERRIDE { return true; }