| Index: storage/common/blob/blob_data.cc
|
| diff --git a/webkit/common/blob/blob_data.cc b/storage/common/blob/blob_data.cc
|
| similarity index 65%
|
| rename from webkit/common/blob/blob_data.cc
|
| rename to storage/common/blob/blob_data.cc
|
| index 368186195163ad219c0705a0625e09c1e7bb70d6..ce533e9f4462b70a5e9c594b51a9df18ddd62471 100644
|
| --- a/webkit/common/blob/blob_data.cc
|
| +++ b/storage/common/blob/blob_data.cc
|
| @@ -2,21 +2,22 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/common/blob/blob_data.h"
|
| +#include "storage/common/blob/blob_data.h"
|
|
|
| #include "base/logging.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/time/time.h"
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| -BlobData::BlobData() {}
|
| -BlobData::BlobData(const std::string& uuid)
|
| - : uuid_(uuid) {
|
| +BlobData::BlobData() {
|
| +}
|
| +BlobData::BlobData(const std::string& uuid) : uuid_(uuid) {
|
| }
|
|
|
| -BlobData::~BlobData() {}
|
| +BlobData::~BlobData() {
|
| +}
|
|
|
| void BlobData::AppendData(const char* data, size_t length) {
|
| DCHECK(length > 0);
|
| @@ -25,39 +26,43 @@ void BlobData::AppendData(const char* data, size_t length) {
|
| }
|
|
|
| void BlobData::AppendFile(const base::FilePath& file_path,
|
| - uint64 offset, uint64 length,
|
| + uint64 offset,
|
| + uint64 length,
|
| const base::Time& expected_modification_time) {
|
| DCHECK(length > 0);
|
| items_.push_back(Item());
|
| - items_.back().SetToFilePathRange(file_path, offset, length,
|
| - expected_modification_time);
|
| + items_.back().SetToFilePathRange(
|
| + file_path, offset, length, expected_modification_time);
|
| }
|
|
|
| void BlobData::AppendBlob(const std::string& uuid,
|
| - uint64 offset, uint64 length) {
|
| + uint64 offset,
|
| + uint64 length) {
|
| DCHECK_GT(length, 0ul);
|
| items_.push_back(Item());
|
| items_.back().SetToBlobRange(uuid, offset, length);
|
| }
|
|
|
| void BlobData::AppendFileSystemFile(
|
| - const GURL& url, uint64 offset,
|
| + const GURL& url,
|
| + uint64 offset,
|
| uint64 length,
|
| const base::Time& expected_modification_time) {
|
| DCHECK(length > 0);
|
| items_.push_back(Item());
|
| - items_.back().SetToFileSystemUrlRange(url, offset, length,
|
| - expected_modification_time);
|
| + items_.back().SetToFileSystemUrlRange(
|
| + url, offset, length, expected_modification_time);
|
| }
|
|
|
| int64 BlobData::GetMemoryUsage() const {
|
| int64 memory = 0;
|
| for (std::vector<Item>::const_iterator iter = items_.begin();
|
| - iter != items_.end(); ++iter) {
|
| + iter != items_.end();
|
| + ++iter) {
|
| if (iter->type() == Item::TYPE_BYTES)
|
| memory += iter->length();
|
| }
|
| return memory;
|
| }
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|