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