summaryrefslogtreecommitdiffstats
path: root/chrome/common/common_param_traits.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/common_param_traits.cc')
-rw-r--r--chrome/common/common_param_traits.cc141
1 files changed, 92 insertions, 49 deletions
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index 40417fc..64fa35c 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,12 +10,12 @@
#include "chrome/common/geoposition.h"
#include "chrome/common/thumbnail_score.h"
#include "chrome/common/web_apps.h"
-#include "gfx/rect.h"
#include "googleurl/src/gurl.h"
#include "net/base/upload_data.h"
#include "printing/backend/print_backend.h"
#include "printing/native_metafile.h"
#include "printing/page_range.h"
+#include "ui/gfx/rect.h"
#ifndef EXCLUDE_SKIA_DEPENDENCIES
#include "third_party/skia/include/core/SkBitmap.h"
@@ -290,50 +290,52 @@ void ParamTraits<WebApplicationInfo>::Log(const WebApplicationInfo& p,
l->append("<WebApplicationInfo>");
}
-void ParamTraits<URLRequestStatus>::Write(Message* m, const param_type& p) {
+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<URLRequestStatus>::Read(const Message* m, void** iter,
- param_type* r) {
+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<URLRequestStatus::Status>(status));
+ r->set_status(static_cast<net::URLRequestStatus::Status>(status));
r->set_os_error(os_error);
return true;
}
-void ParamTraits<URLRequestStatus>::Log(const param_type& p, std::string* l) {
+void ParamTraits<net::URLRequestStatus>::Log(const param_type& p,
+ std::string* l) {
std::string status;
switch (p.status()) {
- case URLRequestStatus::SUCCESS:
+ case net::URLRequestStatus::SUCCESS:
status = "SUCCESS";
break;
- case URLRequestStatus::IO_PENDING:
+ case net::URLRequestStatus::IO_PENDING:
status = "IO_PENDING ";
break;
- case URLRequestStatus::HANDLED_EXTERNALLY:
+ case net::URLRequestStatus::HANDLED_EXTERNALLY:
status = "HANDLED_EXTERNALLY";
break;
- case URLRequestStatus::CANCELED:
+ case net::URLRequestStatus::CANCELED:
status = "CANCELED";
break;
- case URLRequestStatus::FAILED:
+ case net::URLRequestStatus::FAILED:
status = "FAILED";
break;
default:
status = "UNKNOWN";
break;
}
- if (p.status() == URLRequestStatus::FAILED)
+ if (p.status() == net::URLRequestStatus::FAILED)
l->append("(");
LogParam(status, l);
- if (p.status() == URLRequestStatus::FAILED) {
+ if (p.status() == net::URLRequestStatus::FAILED) {
l->append(", ");
LogParam(p.os_error(), l);
l->append(")");
@@ -348,47 +350,83 @@ 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()));
- if (p.type() == net::UploadData::TYPE_BYTES) {
- m->WriteData(&p.bytes()[0], static_cast<int>(p.bytes().size()));
- } else if (p.type() == 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());
- } else {
- WriteParam(m, p.blob_url());
+ 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: {
+ m->WriteData(&p.bytes()[0], static_cast<int>(p.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;
- if (type == net::UploadData::TYPE_BYTES) {
- const char* data;
- int len;
- if (!m->ReadData(iter, &data, &len))
- return false;
- r->SetToBytes(data, len);
- } else if (type == 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);
- } else {
- DCHECK(type == net::UploadData::TYPE_BLOB);
- GURL blob_url;
- if (!ReadParam(m, iter, &blob_url))
- return false;
- r->SetToBlobUrl(blob_url);
+ 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;
}
@@ -403,6 +441,7 @@ void ParamTraits<scoped_refptr<net::UploadData> >::Write(Message* m,
if (p) {
WriteParam(m, *p->elements());
WriteParam(m, p->identifier());
+ WriteParam(m, p->is_chunked());
}
}
@@ -420,9 +459,13 @@ bool ParamTraits<scoped_refptr<net::UploadData> >::Read(const Message* m,
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;
}
generated by cgit v1.1 at 2025-03-12 04:57:22 +0000