| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // IPC messages for resource loading. | 5 // IPC messages for resource loading. |
| 6 | 6 |
| 7 // Multiply-included message file, hence no include guard. | 7 // Multiply-included message file, hence no include guard. |
| 8 #include "base/process.h" | 8 #include "base/process.h" |
| 9 #include "base/shared_memory.h" | 9 #include "base/shared_memory.h" |
| 10 #include "content/common/content_param_traits_macros.h" | 10 #include "content/common/content_param_traits_macros.h" |
| 11 #include "content/public/common/common_param_traits.h" | 11 #include "content/public/common/common_param_traits.h" |
| 12 #include "content/public/common/resource_response.h" | 12 #include "content/public/common/resource_response.h" |
| 13 #include "ipc/ipc_message_macros.h" | 13 #include "ipc/ipc_message_macros.h" |
| 14 #include "net/base/request_priority.h" |
| 14 #include "webkit/glue/resource_request_body.h" | 15 #include "webkit/glue/resource_request_body.h" |
| 15 | 16 |
| 16 #ifndef CONTENT_COMMON_RESOURCE_MESSAGES_H_ | 17 #ifndef CONTENT_COMMON_RESOURCE_MESSAGES_H_ |
| 17 #define CONTENT_COMMON_RESOURCE_MESSAGES_H_ | 18 #define CONTENT_COMMON_RESOURCE_MESSAGES_H_ |
| 18 | 19 |
| 19 namespace webkit_glue { | 20 namespace webkit_glue { |
| 20 struct ResourceDevToolsInfo; | 21 struct ResourceDevToolsInfo; |
| 21 struct ResourceLoadTimingInfo; | 22 struct ResourceLoadTimingInfo; |
| 22 } | 23 } |
| 23 | 24 |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 | 139 |
| 139 // Process ID from which this request originated, or zero if it originated | 140 // Process ID from which this request originated, or zero if it originated |
| 140 // in the renderer itself. | 141 // in the renderer itself. |
| 141 IPC_STRUCT_MEMBER(int, origin_pid) | 142 IPC_STRUCT_MEMBER(int, origin_pid) |
| 142 | 143 |
| 143 // What this resource load is for (main frame, sub-frame, sub-resource, | 144 // What this resource load is for (main frame, sub-frame, sub-resource, |
| 144 // object). | 145 // object). |
| 145 IPC_STRUCT_MEMBER(ResourceType::Type, resource_type) | 146 IPC_STRUCT_MEMBER(ResourceType::Type, resource_type) |
| 146 | 147 |
| 147 // The priority of this request. | 148 // The priority of this request. |
| 148 IPC_STRUCT_MEMBER(WebKit::WebURLRequest::Priority, priority) | 149 IPC_STRUCT_MEMBER(net::RequestPriority, priority) |
| 149 | 150 |
| 150 // Used by plugin->browser requests to get the correct net::URLRequestContext. | 151 // Used by plugin->browser requests to get the correct net::URLRequestContext. |
| 151 IPC_STRUCT_MEMBER(uint32, request_context) | 152 IPC_STRUCT_MEMBER(uint32, request_context) |
| 152 | 153 |
| 153 // Indicates which frame (or worker context) the request is being loaded into, | 154 // Indicates which frame (or worker context) the request is being loaded into, |
| 154 // or kNoHostId. | 155 // or kNoHostId. |
| 155 IPC_STRUCT_MEMBER(int, appcache_host_id) | 156 IPC_STRUCT_MEMBER(int, appcache_host_id) |
| 156 | 157 |
| 157 // Optional resource request body (may be null). | 158 // Optional resource request body (may be null). |
| 158 IPC_STRUCT_MEMBER(scoped_refptr<webkit_glue::ResourceRequestBody>, | 159 IPC_STRUCT_MEMBER(scoped_refptr<webkit_glue::ResourceRequestBody>, |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 int /* request_id */) | 292 int /* request_id */) |
| 292 | 293 |
| 293 // Sent by the renderer process to acknowledge receipt of a | 294 // Sent by the renderer process to acknowledge receipt of a |
| 294 // UploadProgress message. | 295 // UploadProgress message. |
| 295 IPC_MESSAGE_ROUTED1(ResourceHostMsg_UploadProgress_ACK, | 296 IPC_MESSAGE_ROUTED1(ResourceHostMsg_UploadProgress_ACK, |
| 296 int /* request_id */) | 297 int /* request_id */) |
| 297 | 298 |
| 298 // Sent when the renderer process deletes a resource loader. | 299 // Sent when the renderer process deletes a resource loader. |
| 299 IPC_MESSAGE_CONTROL1(ResourceHostMsg_ReleaseDownloadedFile, | 300 IPC_MESSAGE_CONTROL1(ResourceHostMsg_ReleaseDownloadedFile, |
| 300 int /* request_id */) | 301 int /* request_id */) |
| 302 |
| 303 // Sent by the renderer when a resource request changes priority. |
| 304 IPC_MESSAGE_ROUTED2(ResourceHostMsg_DidChangePriority, |
| 305 int /* request_id */, |
| 306 net::RequestPriority) |
| OLD | NEW |