summaryrefslogtreecommitdiffstats
path: root/chromium/content/common/resource_messages.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/common/resource_messages.h')
-rw-r--r--chromium/content/common/resource_messages.h80
1 files changed, 51 insertions, 29 deletions
diff --git a/chromium/content/common/resource_messages.h b/chromium/content/common/resource_messages.h
index 0ee74eb5e09..dc83e5a9321 100644
--- a/chromium/content/common/resource_messages.h
+++ b/chromium/content/common/resource_messages.h
@@ -10,12 +10,12 @@
#include "base/memory/shared_memory.h"
#include "base/process/process.h"
#include "content/common/content_param_traits_macros.h"
+#include "content/common/resource_request_body.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/request_priority.h"
#include "net/http/http_response_info.h"
-#include "webkit/common/resource_request_body.h"
#ifndef CONTENT_COMMON_RESOURCE_MESSAGES_H_
#define CONTENT_COMMON_RESOURCE_MESSAGES_H_
@@ -24,7 +24,7 @@ namespace net {
struct LoadTimingInfo;
}
-namespace webkit_glue {
+namespace content {
struct ResourceDevToolsInfo;
}
@@ -47,8 +47,8 @@ struct CONTENT_EXPORT ParamTraits<webkit_common::DataElement> {
};
template <>
-struct ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> > {
- typedef scoped_refptr<webkit_glue::ResourceDevToolsInfo> param_type;
+struct ParamTraits<scoped_refptr<content::ResourceDevToolsInfo> > {
+ typedef scoped_refptr<content::ResourceDevToolsInfo> param_type;
static void Write(Message* m, const param_type& p);
static bool Read(const Message* m, PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
@@ -63,8 +63,8 @@ struct ParamTraits<net::LoadTimingInfo> {
};
template <>
-struct ParamTraits<scoped_refptr<webkit_glue::ResourceRequestBody> > {
- typedef scoped_refptr<webkit_glue::ResourceRequestBody> param_type;
+struct ParamTraits<scoped_refptr<content::ResourceRequestBody> > {
+ typedef scoped_refptr<content::ResourceRequestBody> param_type;
static void Write(Message* m, const param_type& p);
static bool Read(const Message* m, PickleIterator* iter, param_type* r);
static void Log(const param_type& p, std::string* l);
@@ -84,7 +84,7 @@ IPC_ENUM_TRAITS_MAX_VALUE( \
net::HttpResponseInfo::NUM_OF_CONNECTION_INFOS - 1)
IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseHead)
- IPC_STRUCT_TRAITS_PARENT(webkit_glue::ResourceResponseInfo)
+IPC_STRUCT_TRAITS_PARENT(content::ResourceResponseInfo)
IPC_STRUCT_TRAITS_MEMBER(error_code)
IPC_STRUCT_TRAITS_MEMBER(request_start)
IPC_STRUCT_TRAITS_MEMBER(response_start)
@@ -96,7 +96,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::SyncLoadResult)
IPC_STRUCT_TRAITS_MEMBER(data)
IPC_STRUCT_TRAITS_END()
-IPC_STRUCT_TRAITS_BEGIN(webkit_glue::ResourceResponseInfo)
+IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseInfo)
IPC_STRUCT_TRAITS_MEMBER(request_time)
IPC_STRUCT_TRAITS_MEMBER(response_time)
IPC_STRUCT_TRAITS_MEMBER(headers)
@@ -140,6 +140,9 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request)
// The referrer policy to use.
IPC_STRUCT_MEMBER(blink::WebReferrerPolicy, referrer_policy)
+ // The frame's visiblity state.
+ IPC_STRUCT_MEMBER(blink::WebPageVisibilityState, visiblity_state)
+
// Additional HTTP request headers.
IPC_STRUCT_MEMBER(std::string, headers)
@@ -164,11 +167,15 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request)
IPC_STRUCT_MEMBER(uint32, request_context)
// Indicates which frame (or worker context) the request is being loaded into,
- // or kNoHostId.
+ // or kAppCacheNoHostId.
IPC_STRUCT_MEMBER(int, appcache_host_id)
+ // Indicates which frame (or worker context) the request is being loaded into,
+ // or kInvalidServiceWorkerProviderId.
+ IPC_STRUCT_MEMBER(int, service_worker_provider_id)
+
// Optional resource request body (may be null).
- IPC_STRUCT_MEMBER(scoped_refptr<webkit_glue::ResourceRequestBody>,
+ IPC_STRUCT_MEMBER(scoped_refptr<content::ResourceRequestBody>,
request_body)
IPC_STRUCT_MEMBER(bool, download_to_file)
@@ -182,16 +189,12 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request)
// True if |frame_id| is the main frame of a RenderView.
IPC_STRUCT_MEMBER(bool, is_main_frame)
- // Identifies the frame within the RenderView that sent the request.
- // -1 if unknown / invalid.
- IPC_STRUCT_MEMBER(int64, frame_id)
-
- // True if |parent_frame_id| is the main frame of a RenderView.
+ // True if |parent_render_frame_id| is the main frame of a RenderView.
IPC_STRUCT_MEMBER(bool, parent_is_main_frame)
// Identifies the parent frame of the frame that sent the request.
// -1 if unknown / invalid.
- IPC_STRUCT_MEMBER(int64, parent_frame_id)
+ IPC_STRUCT_MEMBER(int, parent_render_frame_id)
IPC_STRUCT_MEMBER(content::PageTransition, transition_type)
@@ -210,6 +213,27 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request)
IPC_STRUCT_MEMBER(bool, allow_download)
IPC_STRUCT_END()
+// Parameters for a ResourceMsg_RequestComplete
+IPC_STRUCT_BEGIN(ResourceMsg_RequestCompleteData)
+ // The error code.
+ IPC_STRUCT_MEMBER(int, error_code)
+
+ // Was ignored by the request handler.
+ IPC_STRUCT_MEMBER(bool, was_ignored_by_handler)
+
+ // A copy of the data requested exists in the cache.
+ IPC_STRUCT_MEMBER(bool, exists_in_cache)
+
+ // Serialized security info; see content/common/ssl_status_serialization.h.
+ IPC_STRUCT_MEMBER(std::string, security_info)
+
+ // Time the request completed.
+ IPC_STRUCT_MEMBER(base::TimeTicks, completion_time)
+
+ // Total amount of data received from the network.
+ IPC_STRUCT_MEMBER(int64, encoded_data_length)
+IPC_STRUCT_END()
+
// Resource messages sent from the browser to the renderer.
// Sent when the headers are available for a resource request.
@@ -231,9 +255,10 @@ IPC_MESSAGE_CONTROL3(ResourceMsg_UploadProgress,
// Sent when the request has been redirected. The receiver is expected to
// respond with either a FollowRedirect message (if the redirect is to be
// followed) or a CancelRequest message (if it should not be followed).
-IPC_MESSAGE_CONTROL3(ResourceMsg_ReceivedRedirect,
+IPC_MESSAGE_CONTROL4(ResourceMsg_ReceivedRedirect,
int /* request_id */,
GURL /* new_url */,
+ GURL /* new_first_party_for_cookies */,
content::ResourceResponseHead)
// Sent to set the shared memory buffer to be used to transmit response data to
@@ -271,17 +296,15 @@ IPC_MESSAGE_CONTROL3(ResourceMsg_DataDownloaded,
int /* encoded_data_length */)
// Sent when the request has been completed.
-IPC_MESSAGE_CONTROL5(ResourceMsg_RequestComplete,
+IPC_MESSAGE_CONTROL2(ResourceMsg_RequestComplete,
int /* request_id */,
- int /* error_code */,
- bool /* was_ignored_by_handler */,
- std::string /* security info */,
- base::TimeTicks /* completion_time */)
+ ResourceMsg_RequestCompleteData)
// Resource messages sent from the renderer to the browser.
// Makes a resource request via the browser.
-IPC_MESSAGE_ROUTED2(ResourceHostMsg_RequestResource,
+IPC_MESSAGE_CONTROL3(ResourceHostMsg_RequestResource,
+ int /* routing_id */,
int /* request_id */,
ResourceHostMsg_Request)
@@ -291,10 +314,8 @@ IPC_MESSAGE_CONTROL1(ResourceHostMsg_CancelRequest,
// Follows a redirect that occured for the resource request with the ID given
// as the parameter.
-IPC_MESSAGE_CONTROL3(ResourceHostMsg_FollowRedirect,
- int /* request_id */,
- bool /* has_new_first_party_for_cookies */,
- GURL /* new_first_party_for_cookies */)
+IPC_MESSAGE_CONTROL1(ResourceHostMsg_FollowRedirect,
+ int /* request_id */)
// Makes a synchronous resource request via the browser.
IPC_SYNC_MESSAGE_ROUTED2_1(ResourceHostMsg_SyncLoad,
@@ -321,6 +342,7 @@ IPC_MESSAGE_CONTROL1(ResourceHostMsg_ReleaseDownloadedFile,
int /* request_id */)
// Sent by the renderer when a resource request changes priority.
-IPC_MESSAGE_CONTROL2(ResourceHostMsg_DidChangePriority,
+IPC_MESSAGE_CONTROL3(ResourceHostMsg_DidChangePriority,
int /* request_id */,
- net::RequestPriority)
+ net::RequestPriority,
+ int /* intra_priority_value */)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 02:44:14 +0000