| Index: content/common/common_param_traits.cc
|
| ===================================================================
|
| --- content/common/common_param_traits.cc (revision 77019)
|
| +++ content/common/common_param_traits.cc (working copy)
|
| @@ -5,6 +5,10 @@
|
| #include "content/common/common_param_traits.h"
|
|
|
| #include "content/common/content_constants.h"
|
| +#include "net/base/host_port_pair.h"
|
| +#include "net/base/upload_data.h"
|
| +#include "net/http/http_response_headers.h"
|
| +#include "webkit/glue/resource_loader_bridge.h"
|
|
|
| namespace IPC {
|
|
|
| @@ -27,4 +31,400 @@
|
| l->append(p.spec());
|
| }
|
|
|
| +
|
| +void ParamTraits<ResourceType::Type>::Write(Message* m, const param_type& p) {
|
| + m->WriteInt(p);
|
| +}
|
| +
|
| +bool ParamTraits<ResourceType::Type>::Read(const Message* m,
|
| + void** iter,
|
| + param_type* p) {
|
| + int type;
|
| + if (!m->ReadInt(iter, &type) || !ResourceType::ValidType(type))
|
| + return false;
|
| + *p = ResourceType::FromInt(type);
|
| + return true;
|
| +}
|
| +
|
| +void ParamTraits<ResourceType::Type>::Log(const param_type& p, std::string* l) {
|
| + std::string type;
|
| + switch (p) {
|
| + case ResourceType::MAIN_FRAME:
|
| + type = "MAIN_FRAME";
|
| + break;
|
| + case ResourceType::SUB_FRAME:
|
| + type = "SUB_FRAME";
|
| + break;
|
| + case ResourceType::SUB_RESOURCE:
|
| + type = "SUB_RESOURCE";
|
| + break;
|
| + case ResourceType::OBJECT:
|
| + type = "OBJECT";
|
| + break;
|
| + case ResourceType::MEDIA:
|
| + type = "MEDIA";
|
| + break;
|
| + default:
|
| + type = "UNKNOWN";
|
| + break;
|
| + }
|
| +
|
| + LogParam(type, l);
|
| +}
|
| +
|
| +void ParamTraits<net::URLRequestStatus>::Write(Message* m,
|
| + const param_type& p) {
|
| + WriteParam(m, static_cast<int>(p.status()));
|
| + WriteParam(m, p.os_error());
|
| +}
|
| +
|
| +bool ParamTraits<net::URLRequestStatus>::Read(const Message* m, void** iter,
|
| + param_type* r) {
|
| + int status, os_error;
|
| + if (!ReadParam(m, iter, &status) ||
|
| + !ReadParam(m, iter, &os_error))
|
| + return false;
|
| + r->set_status(static_cast<net::URLRequestStatus::Status>(status));
|
| + r->set_os_error(os_error);
|
| + return true;
|
| +}
|
| +
|
| +void ParamTraits<net::URLRequestStatus>::Log(const param_type& p,
|
| + std::string* l) {
|
| + std::string status;
|
| + switch (p.status()) {
|
| + case net::URLRequestStatus::SUCCESS:
|
| + status = "SUCCESS";
|
| + break;
|
| + case net::URLRequestStatus::IO_PENDING:
|
| + status = "IO_PENDING ";
|
| + break;
|
| + case net::URLRequestStatus::HANDLED_EXTERNALLY:
|
| + status = "HANDLED_EXTERNALLY";
|
| + break;
|
| + case net::URLRequestStatus::CANCELED:
|
| + status = "CANCELED";
|
| + break;
|
| + case net::URLRequestStatus::FAILED:
|
| + status = "FAILED";
|
| + break;
|
| + default:
|
| + status = "UNKNOWN";
|
| + break;
|
| + }
|
| + if (p.status() == net::URLRequestStatus::FAILED)
|
| + l->append("(");
|
| +
|
| + LogParam(status, l);
|
| +
|
| + if (p.status() == net::URLRequestStatus::FAILED) {
|
| + l->append(", ");
|
| + LogParam(p.os_error(), l);
|
| + l->append(")");
|
| + }
|
| +}
|
| +
|
| +// Only the net::UploadData ParamTraits<> definition needs this definition, so
|
| +// keep this in the implementation file so we can forward declare UploadData in
|
| +// the header.
|
| +template <>
|
| +struct ParamTraits<net::UploadData::Element> {
|
| + typedef net::UploadData::Element param_type;
|
| + static void Write(Message* m, const param_type& p) {
|
| + WriteParam(m, static_cast<int>(p.type()));
|
| + switch (p.type()) {
|
| + case net::UploadData::TYPE_BYTES: {
|
| + m->WriteData(&p.bytes()[0], static_cast<int>(p.bytes().size()));
|
| + break;
|
| + }
|
| + case net::UploadData::TYPE_CHUNK: {
|
| + std::string chunk_length = StringPrintf(
|
| + "%X\r\n", static_cast<unsigned int>(p.bytes().size()));
|
| + std::vector<char> bytes;
|
| + bytes.insert(bytes.end(), chunk_length.data(),
|
| + chunk_length.data() + chunk_length.length());
|
| + const char* data = &p.bytes()[0];
|
| + bytes.insert(bytes.end(), data, data + p.bytes().size());
|
| + const char* crlf = "\r\n";
|
| + bytes.insert(bytes.end(), crlf, crlf + strlen(crlf));
|
| + if (p.is_last_chunk()) {
|
| + const char* end_of_data = "0\r\n\r\n";
|
| + bytes.insert(bytes.end(), end_of_data,
|
| + end_of_data + strlen(end_of_data));
|
| + }
|
| + m->WriteData(&bytes[0], static_cast<int>(bytes.size()));
|
| + // If this element is part of a chunk upload then send over information
|
| + // indicating if this is the last chunk.
|
| + WriteParam(m, p.is_last_chunk());
|
| + break;
|
| + }
|
| + case net::UploadData::TYPE_FILE: {
|
| + WriteParam(m, p.file_path());
|
| + WriteParam(m, p.file_range_offset());
|
| + WriteParam(m, p.file_range_length());
|
| + WriteParam(m, p.expected_file_modification_time());
|
| + break;
|
| + }
|
| + default: {
|
| + WriteParam(m, p.blob_url());
|
| + break;
|
| + }
|
| + }
|
| + }
|
| + static bool Read(const Message* m, void** iter, param_type* r) {
|
| + int type;
|
| + if (!ReadParam(m, iter, &type))
|
| + return false;
|
| + switch (type) {
|
| + case net::UploadData::TYPE_BYTES: {
|
| + const char* data;
|
| + int len;
|
| + if (!m->ReadData(iter, &data, &len))
|
| + return false;
|
| + r->SetToBytes(data, len);
|
| + break;
|
| + }
|
| + case net::UploadData::TYPE_CHUNK: {
|
| + const char* data;
|
| + int len;
|
| + if (!m->ReadData(iter, &data, &len))
|
| + return false;
|
| + r->SetToBytes(data, len);
|
| + // If this element is part of a chunk upload then we need to explicitly
|
| + // set the type of the element and whether it is the last chunk.
|
| + bool is_last_chunk = false;
|
| + if (!ReadParam(m, iter, &is_last_chunk))
|
| + return false;
|
| + r->set_type(net::UploadData::TYPE_CHUNK);
|
| + r->set_is_last_chunk(is_last_chunk);
|
| + break;
|
| + }
|
| + case net::UploadData::TYPE_FILE: {
|
| + FilePath file_path;
|
| + uint64 offset, length;
|
| + base::Time expected_modification_time;
|
| + if (!ReadParam(m, iter, &file_path))
|
| + return false;
|
| + if (!ReadParam(m, iter, &offset))
|
| + return false;
|
| + if (!ReadParam(m, iter, &length))
|
| + return false;
|
| + if (!ReadParam(m, iter, &expected_modification_time))
|
| + return false;
|
| + r->SetToFilePathRange(file_path, offset, length,
|
| + expected_modification_time);
|
| + break;
|
| + }
|
| + default: {
|
| + DCHECK(type == net::UploadData::TYPE_BLOB);
|
| + GURL blob_url;
|
| + if (!ReadParam(m, iter, &blob_url))
|
| + return false;
|
| + r->SetToBlobUrl(blob_url);
|
| + break;
|
| + }
|
| + }
|
| + return true;
|
| + }
|
| + static void Log(const param_type& p, std::string* l) {
|
| + l->append("<net::UploadData::Element>");
|
| + }
|
| +};
|
| +
|
| +void ParamTraits<scoped_refptr<net::UploadData> >::Write(Message* m,
|
| + const param_type& p) {
|
| + WriteParam(m, p.get() != NULL);
|
| + if (p) {
|
| + WriteParam(m, *p->elements());
|
| + WriteParam(m, p->identifier());
|
| + WriteParam(m, p->is_chunked());
|
| + }
|
| +}
|
| +
|
| +bool ParamTraits<scoped_refptr<net::UploadData> >::Read(const Message* m,
|
| + void** iter,
|
| + param_type* r) {
|
| + bool has_object;
|
| + if (!ReadParam(m, iter, &has_object))
|
| + return false;
|
| + if (!has_object)
|
| + return true;
|
| + std::vector<net::UploadData::Element> elements;
|
| + if (!ReadParam(m, iter, &elements))
|
| + return false;
|
| + int64 identifier;
|
| + if (!ReadParam(m, iter, &identifier))
|
| + return false;
|
| + bool is_chunked = false;
|
| + if (!ReadParam(m, iter, &is_chunked))
|
| + return false;
|
| + *r = new net::UploadData;
|
| + (*r)->swap_elements(&elements);
|
| + (*r)->set_identifier(identifier);
|
| + (*r)->set_is_chunked(is_chunked);
|
| + return true;
|
| +}
|
| +
|
| +void ParamTraits<scoped_refptr<net::UploadData> >::Log(const param_type& p,
|
| + std::string* l) {
|
| + l->append("<net::UploadData>");
|
| +}
|
| +
|
| +void ParamTraits<net::HostPortPair>::Write(Message* m, const param_type& p) {
|
| + WriteParam(m, p.host());
|
| + WriteParam(m, p.port());
|
| +}
|
| +
|
| +bool ParamTraits<net::HostPortPair>::Read(const Message* m, void** iter,
|
| + param_type* r) {
|
| + std::string host;
|
| + uint16 port;
|
| + if (!ReadParam(m, iter, &host) || !ReadParam(m, iter, &port))
|
| + return false;
|
| +
|
| + r->set_host(host);
|
| + r->set_port(port);
|
| + return true;
|
| +}
|
| +
|
| +void ParamTraits<net::HostPortPair>::Log(const param_type& p, std::string* l) {
|
| + l->append(p.ToString());
|
| +}
|
| +
|
| +void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Write(
|
| + Message* m, const param_type& p) {
|
| + WriteParam(m, p.get() != NULL);
|
| + if (p) {
|
| + // Do not disclose Set-Cookie headers over IPC.
|
| + p->Persist(m, net::HttpResponseHeaders::PERSIST_SANS_COOKIES);
|
| + }
|
| +}
|
| +
|
| +bool ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Read(
|
| + const Message* m, void** iter, param_type* r) {
|
| + bool has_object;
|
| + if (!ReadParam(m, iter, &has_object))
|
| + return false;
|
| + if (has_object)
|
| + *r = new net::HttpResponseHeaders(*m, iter);
|
| + return true;
|
| +}
|
| +
|
| +void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log(
|
| + const param_type& p, std::string* l) {
|
| + l->append("<HttpResponseHeaders>");
|
| +}
|
| +
|
| +void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Write(
|
| + Message* m, const param_type& p) {
|
| + WriteParam(m, p.base_time.is_null());
|
| + if (p.base_time.is_null())
|
| + return;
|
| + WriteParam(m, p.base_time);
|
| + WriteParam(m, p.proxy_start);
|
| + WriteParam(m, p.proxy_end);
|
| + WriteParam(m, p.dns_start);
|
| + WriteParam(m, p.dns_end);
|
| + WriteParam(m, p.connect_start);
|
| + WriteParam(m, p.connect_end);
|
| + WriteParam(m, p.ssl_start);
|
| + WriteParam(m, p.ssl_end);
|
| + WriteParam(m, p.send_start);
|
| + WriteParam(m, p.send_end);
|
| + WriteParam(m, p.receive_headers_start);
|
| + WriteParam(m, p.receive_headers_end);
|
| +}
|
| +
|
| +bool ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Read(
|
| + const Message* m, void** iter, param_type* r) {
|
| + bool is_null;
|
| + if (!ReadParam(m, iter, &is_null))
|
| + return false;
|
| + if (is_null)
|
| + return true;
|
| +
|
| + return
|
| + ReadParam(m, iter, &r->base_time) &&
|
| + ReadParam(m, iter, &r->proxy_start) &&
|
| + ReadParam(m, iter, &r->proxy_end) &&
|
| + ReadParam(m, iter, &r->dns_start) &&
|
| + ReadParam(m, iter, &r->dns_end) &&
|
| + ReadParam(m, iter, &r->connect_start) &&
|
| + ReadParam(m, iter, &r->connect_end) &&
|
| + ReadParam(m, iter, &r->ssl_start) &&
|
| + ReadParam(m, iter, &r->ssl_end) &&
|
| + ReadParam(m, iter, &r->send_start) &&
|
| + ReadParam(m, iter, &r->send_end) &&
|
| + ReadParam(m, iter, &r->receive_headers_start) &&
|
| + ReadParam(m, iter, &r->receive_headers_end);
|
| +}
|
| +
|
| +void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Log(const param_type& p,
|
| + std::string* l) {
|
| + l->append("(");
|
| + LogParam(p.base_time, l);
|
| + l->append(", ");
|
| + LogParam(p.proxy_start, l);
|
| + l->append(", ");
|
| + LogParam(p.proxy_end, l);
|
| + l->append(", ");
|
| + LogParam(p.dns_start, l);
|
| + l->append(", ");
|
| + LogParam(p.dns_end, l);
|
| + l->append(", ");
|
| + LogParam(p.connect_start, l);
|
| + l->append(", ");
|
| + LogParam(p.connect_end, l);
|
| + l->append(", ");
|
| + LogParam(p.ssl_start, l);
|
| + l->append(", ");
|
| + LogParam(p.ssl_end, l);
|
| + l->append(", ");
|
| + LogParam(p.send_start, l);
|
| + l->append(", ");
|
| + LogParam(p.send_end, l);
|
| + l->append(", ");
|
| + LogParam(p.receive_headers_start, l);
|
| + l->append(", ");
|
| + LogParam(p.receive_headers_end, l);
|
| + l->append(")");
|
| +}
|
| +
|
| +void ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Write(
|
| + Message* m, const param_type& p) {
|
| + WriteParam(m, p.get() != NULL);
|
| + if (p.get()) {
|
| + WriteParam(m, p->http_status_code);
|
| + WriteParam(m, p->http_status_text);
|
| + WriteParam(m, p->request_headers);
|
| + WriteParam(m, p->response_headers);
|
| + }
|
| +}
|
| +
|
| +bool ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Read(
|
| + const Message* m, void** iter, param_type* r) {
|
| + bool has_object;
|
| + if (!ReadParam(m, iter, &has_object))
|
| + return false;
|
| + if (!has_object)
|
| + return true;
|
| + *r = new webkit_glue::ResourceDevToolsInfo();
|
| + return
|
| + ReadParam(m, iter, &(*r)->http_status_code) &&
|
| + ReadParam(m, iter, &(*r)->http_status_text) &&
|
| + ReadParam(m, iter, &(*r)->request_headers) &&
|
| + ReadParam(m, iter, &(*r)->response_headers);
|
| +}
|
| +
|
| +void ParamTraits<scoped_refptr<webkit_glue::ResourceDevToolsInfo> >::Log(
|
| + const param_type& p, std::string* l) {
|
| + l->append("(");
|
| + if (p) {
|
| + LogParam(p->request_headers, l);
|
| + l->append(", ");
|
| + LogParam(p->response_headers, l);
|
| + }
|
| + l->append(")");
|
| +}
|
| +
|
| } // namespace IPC
|
|
|