[Storage] Blob items are now shared between blobs. Ready for disk swap.

storage/browser/blob/blob_data_item.h

Index: storage/browser/blob/blob_data_item.h
diff --git a/storage/browser/blob/blob_data_item.h b/storage/browser/blob/blob_data_item.h
index 099415b6e14079698754a61e477d7f426a183e92..68fe7e29260b20ae05aa9fb1dfd4b07f12181e0c 100644
--- a/storage/browser/blob/blob_data_item.h
+++ b/storage/browser/blob/blob_data_item.h
@@ -22,13 +22,13 @@ class BlobStorageContext;
 // to memory) by the BlobStorageContext.
 class STORAGE_EXPORT BlobDataItem : public base::RefCounted<BlobDataItem> {
  public:
-  storage::DataElement::Type type() const { return item_->type(); }
+  DataElement::Type type() const { return item_->type(); }
   const char* bytes() const { return item_->bytes(); }
   const base::FilePath& path() const { return item_->path(); }
   const GURL& filesystem_url() const { return item_->filesystem_url(); }
   const std::string& blob_uuid() const { return item_->blob_uuid(); }
-  uint64 offset() const { return item_->offset(); }
-  uint64 length() const { return item_->length(); }
+  size_t offset() const { return item_->offset(); }

[michaeln, 2015/02/05 20:02:09]

Not sure size_t is the right type for offset & length? I think these can be
offsets into files so either int64 or uint64 would be a better fit.

[dmurph, 2015/02/06 01:32:30]

Changed back to uint64

+  size_t length() const { return item_->length(); }
   const base::Time& expected_modification_time() const {
     return item_->expected_modification_time();
   }
@@ -39,12 +39,13 @@ class STORAGE_EXPORT BlobDataItem : public base::RefCounted<BlobDataItem> {
   friend class BlobDataBuilder;
   friend class BlobStorageContext;
   friend class base::RefCounted<BlobDataItem>;
+
   BlobDataItem(scoped_ptr<DataElement> item);
   BlobDataItem(scoped_ptr<DataElement> item,
                scoped_refptr<ShareableFileReference> file_handle);
   virtual ~BlobDataItem();
 
-  scoped_ptr<storage::DataElement> item_;
+  scoped_ptr<DataElement> item_;
   scoped_refptr<ShareableFileReference> file_handle_;
 };