From 1dfff5c058db41e3b2caa74159ee7ed458bc9d69 Mon Sep 17 00:00:00 2001 From: "michaeln@chromium.org" Date: Thu, 14 Oct 2010 00:43:14 +0000 Subject: Add deletable file refs to Blobs BUG=52486 TEST=manual Review URL: http://codereview.chromium.org/3582002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62485 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/blob/blob_data.h | 19 ++++--- webkit/blob/blob_storage_controller.cc | 96 ++++++++++++++++++++-------------- webkit/blob/blob_storage_controller.h | 7 +++ 3 files changed, 76 insertions(+), 46 deletions(-) (limited to 'webkit/blob') diff --git a/webkit/blob/blob_data.h b/webkit/blob/blob_data.h index ddd0e65..3be694f 100644 --- a/webkit/blob/blob_data.h +++ b/webkit/blob/blob_data.h @@ -12,6 +12,7 @@ #include "base/ref_counted.h" #include "base/time.h" #include "googleurl/src/gurl.h" +#include "webkit/blob/deletable_file_reference.h" namespace WebKit { class WebBlobData; @@ -117,14 +118,12 @@ class BlobData : public base::RefCounted { items_.back().SetToBlob(blob_url, offset, length); } - const std::vector& items() const { return items_; } - void set_items(const std::vector& items) { - items_ = items; - } - void swap_items(std::vector* items) { - items_.swap(*items); + void AttachDeletableFileReference(DeletableFileReference* reference) { + deletable_files_.push_back(reference); } + const std::vector& items() const { return items_; } + const std::string& content_type() const { return content_type_; } void set_content_type(const std::string& content_type) { content_type_ = content_type; @@ -137,6 +136,11 @@ class BlobData : public base::RefCounted { content_disposition_ = content_disposition; } + // Should only be called by the IPC ParamTraits for this class. + void swap_items(std::vector* items) { + items_.swap(*items); + } + private: friend class base::RefCounted; @@ -145,6 +149,9 @@ class BlobData : public base::RefCounted { std::string content_type_; std::string content_disposition_; std::vector items_; + std::vector > deletable_files_; + + DISALLOW_COPY_AND_ASSIGN(BlobData); }; #if defined(UNIT_TEST) diff --git a/webkit/blob/blob_storage_controller.cc b/webkit/blob/blob_storage_controller.cc index 274c381..e813be2 100644 --- a/webkit/blob/blob_storage_controller.cc +++ b/webkit/blob/blob_storage_controller.cc @@ -17,42 +17,6 @@ BlobStorageController::BlobStorageController() { BlobStorageController::~BlobStorageController() { } -void BlobStorageController::AppendStorageItems( - BlobData* target_blob_data, BlobData* src_blob_data, - uint64 offset, uint64 length) { - DCHECK(target_blob_data && src_blob_data && - length != static_cast(-1)); - - std::vector::const_iterator iter = - src_blob_data->items().begin(); - if (offset) { - for (; iter != src_blob_data->items().end(); ++iter) { - if (offset >= iter->length()) - offset -= iter->length(); - else - break; - } - } - - for (; iter != src_blob_data->items().end() && length > 0; ++iter) { - uint64 current_length = iter->length() - offset; - uint64 new_length = current_length > length ? length : current_length; - if (iter->type() == BlobData::TYPE_DATA) { - target_blob_data->AppendData(iter->data(), - static_cast(iter->offset() + offset), - static_cast(new_length)); - } else { - DCHECK(iter->type() == BlobData::TYPE_FILE); - target_blob_data->AppendFile(iter->file_path(), - iter->offset() + offset, - new_length, - iter->expected_modification_time()); - } - length -= new_length; - offset = 0; - } -} - void BlobStorageController::RegisterBlobUrl( const GURL& url, const BlobData* blob_data) { scoped_refptr target_blob_data = new BlobData(); @@ -78,10 +42,11 @@ void BlobStorageController::RegisterBlobUrl( break; } case BlobData::TYPE_FILE: - target_blob_data->AppendFile(iter->file_path(), - iter->offset(), - iter->length(), - iter->expected_modification_time()); + AppendFileItem(target_blob_data, + iter->file_path(), + iter->offset(), + iter->length(), + iter->expected_modification_time()); break; case BlobData::TYPE_BLOB: { BlobData* src_blob_data = GetBlobDataFromUrl(iter->blob_url()); @@ -179,4 +144,55 @@ void BlobStorageController::ResolveBlobReferencesInUploadData( } } +void BlobStorageController::AppendStorageItems( + BlobData* target_blob_data, BlobData* src_blob_data, + uint64 offset, uint64 length) { + DCHECK(target_blob_data && src_blob_data && + length != static_cast(-1)); + + std::vector::const_iterator iter = + src_blob_data->items().begin(); + if (offset) { + for (; iter != src_blob_data->items().end(); ++iter) { + if (offset >= iter->length()) + offset -= iter->length(); + else + break; + } + } + + for (; iter != src_blob_data->items().end() && length > 0; ++iter) { + uint64 current_length = iter->length() - offset; + uint64 new_length = current_length > length ? length : current_length; + if (iter->type() == BlobData::TYPE_DATA) { + target_blob_data->AppendData(iter->data(), + static_cast(iter->offset() + offset), + static_cast(new_length)); + } else { + DCHECK(iter->type() == BlobData::TYPE_FILE); + AppendFileItem(target_blob_data, + iter->file_path(), + iter->offset() + offset, + new_length, + iter->expected_modification_time()); + } + length -= new_length; + offset = 0; + } +} + +void BlobStorageController::AppendFileItem( + BlobData* target_blob_data, + const FilePath& file_path, uint64 offset, uint64 length, + const base::Time& expected_modification_time) { + target_blob_data->AppendFile(file_path, offset, length, + expected_modification_time); + + // It may be a temporary file that should be deleted when no longer needed. + scoped_refptr deletable_file = + DeletableFileReference::Get(file_path); + if (deletable_file) + target_blob_data->AttachDeletableFileReference(deletable_file); +} + } // namespace webkit_blob diff --git a/webkit/blob/blob_storage_controller.h b/webkit/blob/blob_storage_controller.h index 1f0b25e..74bc131b 100644 --- a/webkit/blob/blob_storage_controller.h +++ b/webkit/blob/blob_storage_controller.h @@ -10,7 +10,11 @@ #include "base/ref_counted.h" class GURL; +class FilePath; +namespace base { +class Time; +} namespace net { class UploadData; } @@ -41,6 +45,9 @@ class BlobStorageController { BlobData* src_blob_data, uint64 offset, uint64 length); + void AppendFileItem(BlobData* target_blob_data, + const FilePath& file_path, uint64 offset, uint64 length, + const base::Time& expected_modification_time); typedef base::hash_map > BlobMap; BlobMap blob_map_; -- cgit v1.1