summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-09 12:15:52 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-09 12:16:06 +0100
commitde4f791e30be4e4239b381c11745ffa4d87ddb8b (patch)
tree885e3a5d6670828b454cf676b4d42f78e28b1f0e /Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
parentb022df48697d40cdabdeafb2c29bb14fe489b6fe (diff)
downloadqtwebkit-de4f791e30be4e4239b381c11745ffa4d87ddb8b.tar.gz
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit.org/repository/webkit/trunk@133952)
Revert back to an older snapshot that should build on ARM
Diffstat (limited to 'Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp')
-rw-r--r--Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp26
1 files changed, 2 insertions, 24 deletions
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 <WebCore/ResourceBuffer.h>
#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> resourceBuffer;
-
- RefPtr<ShareableResource> 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)