From de4f791e30be4e4239b381c11745ffa4d87ddb8b Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 9 Nov 2012 12:15:52 +0100 Subject: Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952) Revert back to an older snapshot that should build on ARM --- .../Network/NetworkProcessConnection.cpp | 26 ++-------------------- 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp') diff --git a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp index 69e30419d..10d672208 100644 --- a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp @@ -27,13 +27,9 @@ #include "NetworkProcessConnection.h" #include "WebProcess.h" -#include "WebResourceBuffer.h" -#include #if ENABLE(NETWORK_PROCESS) -using namespace WebCore; - namespace WebKit { NetworkProcessConnection::NetworkProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier) @@ -70,29 +66,11 @@ void NetworkProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, Co { } -void NetworkProcessConnection::didReceiveResponse(ResourceLoadIdentifier resourceLoadIdentifier, const ResourceResponse& response) +void NetworkProcessConnection::startResourceLoad(ResourceLoadIdentifier resourceLoadIdentifier) { - WebProcess::shared().webResourceLoadScheduler().didReceiveResponse(resourceLoadIdentifier, response); + WebProcess::shared().webResourceLoadScheduler().startResourceLoad(resourceLoadIdentifier); } - -void NetworkProcessConnection::didReceiveResource(ResourceLoadIdentifier resourceLoadIdentifier, const ShareableResource::Handle& handle, double finishTime) -{ - RefPtr resourceBuffer; - - RefPtr resource = ShareableResource::create(handle); - if (resource) - resourceBuffer = WebResourceBuffer::create(resource.release()); - else - resourceBuffer = ResourceBuffer::create(); - WebProcess::shared().webResourceLoadScheduler().didReceiveResource(resourceLoadIdentifier, *resourceBuffer, finishTime); -} - -void NetworkProcessConnection::didFailResourceLoad(ResourceLoadIdentifier resourceLoadIdentifier, const ResourceError& error) -{ - WebProcess::shared().webResourceLoadScheduler().didFailResourceLoad(resourceLoadIdentifier, error); -} - } // namespace WebKit #endif // ENABLE(NETWORK_PROCESS) -- cgit v1.2.1