Index: storage/browser/blob/internal_blob_data.h |
diff --git a/storage/browser/blob/internal_blob_data.h b/storage/browser/blob/internal_blob_data.h |
index 65db2f3cdc322fe85a8c01e275d2c988601b95e9..f30c52000a7c73a7444f5c04a084a465396ba9a4 100644 |
--- a/storage/browser/blob/internal_blob_data.h |
+++ b/storage/browser/blob/internal_blob_data.h |
@@ -13,68 +13,48 @@ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "storage/browser/blob/shareable_blob_data_item.h" |
+#include "storage/browser/storage_browser_export.h" |
namespace storage { |
+class ShareableBlobDataItem; |
class ViewBlobInternalsJob; |
-// This class represents a blob in the BlobStorageContext. It is constructed |
-// using the internal Builder class. |
-class InternalBlobData { |
+// This class represents a blob. We export this only for unit tests. |
+class STORAGE_EXPORT InternalBlobData { |
public: |
~InternalBlobData(); |
+ InternalBlobData(); |
- protected: |
- friend class BlobStorageContext; |
- friend class BlobStorageRegistry; |
- friend class ViewBlobInternalsJob; |
+ // Appends the given shared blob data item to this object. We add |my_uuid| |
+ // to the shareable item's uuid set. |
+ void AppendSharedBlobItem(const std::string& my_uuid, |
+ scoped_refptr<ShareableBlobDataItem> item); |
// Removes the given blob uuid from the internal ShareableBlobDataItems. |
// This is called when this blob is being destroyed. |
void RemoveBlobFromShareableItems(const std::string& blob_uuid); |
const std::vector<scoped_refptr<ShareableBlobDataItem>>& items() const; |
+ const std::vector<uint64_t>& offsets() const { return offsets_; } |
// Gets the memory used by this blob that is not shared by other blobs. This |
// also doesn't count duplicate items. |
size_t GetUnsharedMemoryUsage() const; |
- // Gets the memory used by this blob. Total memory includes memory of items |
- // possibly shared with other blobs, or items that appear multiple times in |
- // this blob. Unshared memory is memory used by this blob that is not shared |
- // by other blobs. |
- void GetMemoryUsage(size_t* total_memory, size_t* unshared_memory); |
+ // Total size of this blob in bytes. |
+ uint64_t total_size() const { return size_; }; |
private: |
- friend class Builder; |
- InternalBlobData(); |
+ friend class BlobStorageContext; |
- std::string content_type_; |
- std::string content_disposition_; |
std::vector<scoped_refptr<ShareableBlobDataItem>> items_; |
- class Builder { |
- public: |
- Builder(); |
- ~Builder(); |
- |
- void AppendSharedBlobItem(scoped_refptr<ShareableBlobDataItem> item); |
- |
- // Gets the memory used by this builder that is not shared with other blobs. |
- size_t GetNonsharedMemoryUsage() const; |
- |
- // Removes the given blob uuid from the internal ShareableBlobDataItems. |
- // This is called on destruction of the blob if we're still building it. |
- void RemoveBlobFromShareableItems(const std::string& blob_uuid); |
- |
- // The builder is invalid after calling this method. |
- std::unique_ptr<::storage::InternalBlobData> Build(); |
- |
- private: |
- std::unique_ptr<::storage::InternalBlobData> data_; |
+ // Size in bytes. If we're a single file then this can be uint64_max. |
+ uint64_t size_ = 0; |
- DISALLOW_COPY_AND_ASSIGN(Builder); |
- }; |
+ // Only populated if len(items_) > 1. Used for binary search. |
+ // Since the offset of the first item is always 0, we exclude this. |
+ std::vector<uint64_t> offsets_; |
DISALLOW_COPY_AND_ASSIGN(InternalBlobData); |
}; |