diff options
author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 13:57:42 +0000 |
---|---|---|
committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 13:57:42 +0000 |
commit | e3e402c11b05ae0562199543ca6a17e09bbab6b2 (patch) | |
tree | e6d1bf0123934b7580a302ae35467f3fd4c3ada6 /content/common/resource_messages.h | |
parent | 4b88b74e5e7ccf857104b2212518c65940489699 (diff) | |
download | chromium_src-e3e402c11b05ae0562199543ca6a17e09bbab6b2.zip chromium_src-e3e402c11b05ae0562199543ca6a17e09bbab6b2.tar.gz chromium_src-e3e402c11b05ae0562199543ca6a17e09bbab6b2.tar.bz2 |
Split net::UploadData into two: for resource request IPC and for upload handling
Introducing webkit_glue::ResourceRequestBody as a content-level abstraction corresponding to WebHTTPBody and as an alternative of net::UploadData in ResourceRequest.
This interface can contain content-level objects like Blob (or FileSystem URL in later patches) while net::UploadData should NOT.
This patch also removes Blob support in net::UploadData.
BUG=110119
TEST=existing tests
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=152528
Review URL: https://chromiumcodereview.appspot.com/10834289
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/resource_messages.h')
-rw-r--r-- | content/common/resource_messages.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h index 69a2ae6..638d238 100644 --- a/content/common/resource_messages.h +++ b/content/common/resource_messages.h @@ -9,7 +9,7 @@ #include "content/public/common/common_param_traits.h" #include "content/public/common/resource_response.h" #include "ipc/ipc_message_macros.h" -#include "net/base/upload_data.h" +#include "webkit/glue/resource_request_body.h" #define IPC_MESSAGE_START ResourceMsgStart #undef IPC_MESSAGE_EXPORT @@ -94,8 +94,9 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request) // or kNoHostId. IPC_STRUCT_MEMBER(int, appcache_host_id) - // Optional upload data (may be null). - IPC_STRUCT_MEMBER(scoped_refptr<net::UploadData>, upload_data) + // Optional resource request body (may be null). + IPC_STRUCT_MEMBER(scoped_refptr<webkit_glue::ResourceRequestBody>, + request_body) IPC_STRUCT_MEMBER(bool, download_to_file) |