[BlobStorage] Implementing disk.

storage/browser/blob/blob_entry.h

Index: storage/browser/blob/blob_entry.h
diff --git a/storage/browser/blob/blob_entry.h b/storage/browser/blob/blob_entry.h
index 3c3869e89f4d9a8b8a382c74f59dd370f590c481..f86fe5ba7982c4c12d9a2cec2fd47210905f9eb2 100644
--- a/storage/browser/blob/blob_entry.h
+++ b/storage/browser/blob/blob_entry.h
@@ -24,16 +24,15 @@ class BlobDataHandle;
 class ShareableBlobDataItem;
 class ViewBlobInternalsJob;
 
-// This class represents a blob in BlobStorageRegistry. We export this only for
-// unit tests.
+// Represents a blob in BlobStorageRegistry. Exported only for unit tests.
 class STORAGE_EXPORT BlobEntry {
  public:
   using TransportAllowedCallback =
       base::Callback<void(BlobStatus,
                           std::vector<BlobMemoryController::FileCreationInfo>)>;
 
-  // This records a copy from a referenced blob. When we finish building our
-  // blob we perform all of these copies.
+  // Records a copy from a referenced blob. Copies happen after referenced blobs
+  // are complete & quota for the copies is granted.
   struct STORAGE_EXPORT ItemCopyEntry {
     ItemCopyEntry(scoped_refptr<ShareableBlobDataItem> source_item,
                   size_t source_item_offset,
@@ -50,11 +49,11 @@ class STORAGE_EXPORT BlobEntry {
     DISALLOW_COPY_AND_ASSIGN(ItemCopyEntry);
   };
 
-  // This keeps track of our building state for our blob. While building, four
-  // things can be happening mostly simultaneously:
-  // 1. Waiting for quota to be reserved for memory needed (PENDING_QUOTA)
+  // Building state for pending blobs. State can include:
+  // 1. Waiting for quota to be granted for transport data (PENDING_QUOTA)
   // 2. Waiting for user population of data after quota (PENDING_TRANSPORT)
-  // 3. Waiting for blobs we reference to complete (PENDING_INTERNALS)
+  // 3. Waiting for blobs we reference to complete & quota granted for possible
+  //    copies. (PENDING_INTERNALS)
   struct STORAGE_EXPORT BuildingState {
     // |transport_allowed_callback| is not null when data needs population. See
     // BlobStorageContext::BuildBlob for when the callback is called.
@@ -63,6 +62,9 @@ class STORAGE_EXPORT BlobEntry {
                   size_t num_building_dependent_blobs);
     ~BuildingState();
 
+    // Cancels pending memory or file requests.
+    void CancelRequests();
+
     const bool transport_items_present;
     // We can have trasnport data that's either populated or unpopulated. If we
     // need population, this is populated.
@@ -75,7 +77,10 @@ class STORAGE_EXPORT BlobEntry {
     size_t num_building_dependent_blobs;
 
     base::WeakPtr<BlobMemoryController::QuotaAllocationTask>
-        memory_quota_request;
+        transport_quota_request;
+
+    // Copy quota is always memory.
+    base::WeakPtr<BlobMemoryController::QuotaAllocationTask> copy_quota_request;
 
     // These are copies from a referenced blob item to our blob items. Some of
     // these entries may have changed from bytes to files if they were paged.
@@ -97,7 +102,8 @@ class STORAGE_EXPORT BlobEntry {
 
   // Returns if we're a pending blob that can finish building.
   bool CanFinishBuilding() const {
-    return status_ == BlobStatus::PENDING_INTERNALS &&
+    return status_ == BlobStatus::PENDING_INTERNALS && building_state_ &&
+           !building_state_->copy_quota_request &&

[michaeln, 2016/12/02 20:41:07]

what about the transport_quota_request, should that be in this test too?

[dmurph, 2016/12/02 21:53:07]

The transport state are handled by the status_ code. If we need quota for
transport, then the status_ will be PENDING_QUOTA. I'll write a comment to
clarify.

            building_state_->num_building_dependent_blobs == 0;
   }