Chromium Code Reviews| Index: Source/core/platform/network/ResourceHandle.cpp |
| diff --git a/Source/core/platform/network/ResourceHandle.cpp b/Source/core/platform/network/ResourceHandle.cpp |
| index 3bfa801e6d5d36dac4fb36f99dd8ddaab241a90a..5633ae87d9c477d134c08fa4994ee82ff730b315 100644 |
| --- a/Source/core/platform/network/ResourceHandle.cpp |
| +++ b/Source/core/platform/network/ResourceHandle.cpp |
| @@ -33,7 +33,6 @@ |
| #include "core/platform/chromium/support/WrappedResourceRequest.h" |
| #include "core/platform/chromium/support/WrappedResourceResponse.h" |
| -#include "core/platform/network/NetworkingContext.h" |
| #include "core/platform/network/ResourceError.h" |
| #include "core/platform/network/ResourceHandleClient.h" |
| #include "core/platform/network/ResourceHandleInternal.h" |
| @@ -51,9 +50,8 @@ using namespace WebKit; |
| namespace WebCore { |
| // ResourceHandleInternal ----------------------------------------------------- |
| -ResourceHandleInternal::ResourceHandleInternal(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client) |
| - : m_context(context) |
| - , m_request(request) |
| +ResourceHandleInternal::ResourceHandleInternal(const ResourceRequest& request, ResourceHandleClient* client) |
| + : m_request(request) |
| , m_owner(0) |
| , m_client(client) |
| , m_state(ConnectionStateNew) |
| @@ -173,28 +171,24 @@ ResourceHandleInternal* ResourceHandleInternal::FromResourceHandle(ResourceHandl |
| // ResourceHandle ------------------------------------------------------------- |
| -ResourceHandle::ResourceHandle(NetworkingContext* context, const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff) |
| - : d(adoptPtr(new ResourceHandleInternal(context, request, client))) |
| +ResourceHandle::ResourceHandle(const ResourceRequest& request, ResourceHandleClient* client, bool defersLoading, bool shouldContentSniff) |
| + : d(adoptPtr(new ResourceHandleInternal(request, client))) |
| { |
| d->setOwner(this); |
| // FIXME: Figure out what to do with the bool params. |
| } |
| -PassRefPtr<ResourceHandle> ResourceHandle::create(NetworkingContext* context, |
| - const ResourceRequest& request, |
| +PassRefPtr<ResourceHandle> ResourceHandle::create(const ResourceRequest& request, |
| ResourceHandleClient* client, |
| bool defersLoading, |
| bool shouldContentSniff, |
| StoredCredentials storedCredentials) |
| { |
| - RefPtr<ResourceHandle> newHandle = adoptRef(new ResourceHandle( |
| - context, request, client, defersLoading, shouldContentSniff)); |
| + RefPtr<ResourceHandle> newHandle = adoptRef(new ResourceHandle(request, client, defersLoading, shouldContentSniff)); |
| - if (newHandle->start(storedCredentials)) |
| - return newHandle.release(); |
| - |
| - return 0; |
| + newHandle->start(storedCredentials); |
| + return newHandle.release(); |
| } |
| ResourceRequest& ResourceHandle::firstRequest() |
| @@ -202,11 +196,6 @@ ResourceRequest& ResourceHandle::firstRequest() |
| return d->request(); |
| } |
| -NetworkingContext* ResourceHandle::context() const |
| -{ |
| - return d->context(); |
| -} |
| - |
| ResourceHandleClient* ResourceHandle::client() const |
| { |
| return d->client(); |
| @@ -222,13 +211,9 @@ void ResourceHandle::setDefersLoading(bool value) |
| d->setDefersLoading(value); |
| } |
| -bool ResourceHandle::start(StoredCredentials storedCredentials) |
| +void ResourceHandle::start(StoredCredentials storedCredentials) |
| { |
| - if (!d->context()) |
| - return false; |
|
abarth-chromium
2013/06/03 21:11:53
This probably allows data URLs in SVG in <img> to
pdr.
2013/06/03 21:34:42
Not quite, but very close.
|
| - |
| d->start(storedCredentials); |
| - return true; |
| } |
| void ResourceHandle::cancel() |
| @@ -242,8 +227,7 @@ ResourceHandle::~ResourceHandle() |
| } |
| // static |
| -void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, |
| - const ResourceRequest& request, |
| +void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, |
| StoredCredentials storedCredentials, |
| ResourceError& error, |
| ResourceResponse& response, |