diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 01:23:34 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 01:23:34 +0000 |
| commit | 2336ffec2176cdd2aa3c98ee4a3f1ce1e84fc408 (patch) | |
| tree | dc735317f1d63ab8fe44b0b01fd6e46b63c770fe /content/common/resource_messages.h | |
| parent | 4bbc81d76526eb451eb9fbeb82cd99d245f324e2 (diff) | |
| download | chromium_src-2336ffec2176cdd2aa3c98ee4a3f1ce1e84fc408.zip chromium_src-2336ffec2176cdd2aa3c98ee4a3f1ce1e84fc408.tar.gz chromium_src-2336ffec2176cdd2aa3c98ee4a3f1ce1e84fc408.tar.bz2 | |
Move ResourceResponse struct into the Content API, since it's used in Chrome. While at it, I also made the ResourceResponse wrapper just derive from ResourceResponseHead, so that the parameters are accessed directly, instead of having to go through a member variable.
BUG=98716
Review URL: http://codereview.chromium.org/8680036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111471 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/resource_messages.h')
| -rw-r--r-- | content/common/resource_messages.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h index a6982e6..854290a 100644 --- a/content/common/resource_messages.h +++ b/content/common/resource_messages.h @@ -6,8 +6,8 @@ // Multiply-included message file, hence no include guard. #include "base/shared_memory.h" -#include "content/common/resource_response.h" #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" @@ -15,6 +15,17 @@ #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT +IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseHead) + IPC_STRUCT_TRAITS_PARENT(webkit_glue::ResourceResponseInfo) + IPC_STRUCT_TRAITS_MEMBER(status) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(content::SyncLoadResult) + IPC_STRUCT_TRAITS_PARENT(content::ResourceResponseHead) + IPC_STRUCT_TRAITS_MEMBER(final_url) + IPC_STRUCT_TRAITS_MEMBER(data) +IPC_STRUCT_TRAITS_END() + IPC_STRUCT_TRAITS_BEGIN(webkit_glue::ResourceResponseInfo) IPC_STRUCT_TRAITS_MEMBER(request_time) IPC_STRUCT_TRAITS_MEMBER(response_time) @@ -38,17 +49,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::ResourceResponseInfo) IPC_STRUCT_TRAITS_MEMBER(socket_address) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(ResourceResponseHead) - IPC_STRUCT_TRAITS_PARENT(webkit_glue::ResourceResponseInfo) - IPC_STRUCT_TRAITS_MEMBER(status) -IPC_STRUCT_TRAITS_END() - -IPC_STRUCT_TRAITS_BEGIN(SyncLoadResult) - IPC_STRUCT_TRAITS_PARENT(ResourceResponseHead) - IPC_STRUCT_TRAITS_MEMBER(final_url) - IPC_STRUCT_TRAITS_MEMBER(data) -IPC_STRUCT_TRAITS_END() - // Parameters for a resource request. IPC_STRUCT_BEGIN(ResourceHostMsg_Request) // The request method: GET, POST, etc. @@ -118,7 +118,7 @@ IPC_STRUCT_END() // Sent when the headers are available for a resource request. IPC_MESSAGE_ROUTED2(ResourceMsg_ReceivedResponse, int /* request_id */, - ResourceResponseHead) + content::ResourceResponseHead) // Sent when cached metadata from a resource request is ready. IPC_MESSAGE_ROUTED2(ResourceMsg_ReceivedCachedMetadata, @@ -137,7 +137,7 @@ IPC_MESSAGE_ROUTED3(ResourceMsg_UploadProgress, IPC_MESSAGE_ROUTED3(ResourceMsg_ReceivedRedirect, int /* request_id */, GURL /* new_url */, - ResourceResponseHead) + content::ResourceResponseHead) // Sent when some data from a resource request is ready. The handle should // already be mapped into the process that receives this message. @@ -190,7 +190,7 @@ IPC_MESSAGE_ROUTED3(ResourceHostMsg_FollowRedirect, IPC_SYNC_MESSAGE_ROUTED2_1(ResourceHostMsg_SyncLoad, int /* request_id */, ResourceHostMsg_Request, - SyncLoadResult) + content::SyncLoadResult) // Sent when the renderer process is done processing a DataReceived // message. |