| Index: storage/browser/blob/blob_async_builder_host.h
|
| diff --git a/storage/browser/blob/blob_async_builder_host.h b/storage/browser/blob/blob_async_builder_host.h
|
| index b7e82fb3dd7dd97b6422b70e301f881dbab93f5d..2eebcf9f3b532698aa885569a66035960000eb21 100644
|
| --- a/storage/browser/blob/blob_async_builder_host.h
|
| +++ b/storage/browser/blob/blob_async_builder_host.h
|
| @@ -22,6 +22,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "storage/browser/blob/blob_async_transport_request_builder.h"
|
| #include "storage/browser/blob/blob_data_builder.h"
|
| +#include "storage/browser/blob/blob_memory_controller.h"
|
| #include "storage/browser/blob/blob_transport_result.h"
|
| #include "storage/browser/storage_browser_export.h"
|
| #include "storage/common/blob_storage/blob_item_bytes_request.h"
|
| @@ -52,6 +53,9 @@ class STORAGE_EXPORT BlobAsyncBuilderHost {
|
| std::unique_ptr<std::vector<storage::BlobItemBytesRequest>>,
|
| std::unique_ptr<std::vector<base::SharedMemoryHandle>>,
|
| std::unique_ptr<std::vector<base::File>>)>;
|
| + using ErrorCallback = base::Callback<void(IPCBlobCreationCancelCode)>;
|
| + using DoneCallback = base::Closure;
|
| +
|
| BlobAsyncBuilderHost();
|
| ~BlobAsyncBuilderHost();
|
|
|
| @@ -65,12 +69,16 @@ class STORAGE_EXPORT BlobAsyncBuilderHost {
|
| // doesn't exist. We store the blob in the context as broken with code
|
| // REFERENCED_BLOB_BROKEN.
|
| // * DONE if we successfully registered the blob.
|
| - BlobTransportResult RegisterBlobUUID(
|
| + BlobTransportResult RegisterBlob(
|
| const std::string& uuid,
|
| const std::string& content_type,
|
| const std::string& content_disposition,
|
| - const std::set<std::string>& referenced_blob_uuids,
|
| - BlobStorageContext* context);
|
| + const std::vector<DataElement>& elements,
|
| + BlobStorageContext* context,
|
| + std::unique_ptr<BlobDataHandle>* handle_output,
|
| + const RequestMemoryCallback& request_memory,
|
| + const ErrorCallback& report_error,
|
| + const DoneCallback& done_callback);
|
|
|
| // This method begins the construction of the blob given the descriptions. The
|
| // blob uuid MUST be building in this object.
|
| @@ -84,12 +92,6 @@ class STORAGE_EXPORT BlobAsyncBuilderHost {
|
| // before returning.
|
| // * BAD_IPC: The arguments were invalid/bad. This marks the blob as broken in
|
| // the context before returning.
|
| - BlobTransportResult StartBuildingBlob(
|
| - const std::string& uuid,
|
| - const std::vector<DataElement>& elements,
|
| - size_t memory_available,
|
| - BlobStorageContext* context,
|
| - const RequestMemoryCallback& request_memory);
|
|
|
| // This is called when we have responses from the Renderer to our calls to
|
| // the request_memory callback above. See above for return value meaning.
|
| @@ -122,30 +124,25 @@ class STORAGE_EXPORT BlobAsyncBuilderHost {
|
| return async_blob_map_.find(key) != async_blob_map_.end();
|
| }
|
|
|
| - // For testing use only. Must be called before StartBuildingBlob.
|
| - void SetMemoryConstantsForTesting(size_t max_ipc_memory_size,
|
| - size_t max_shared_memory_size,
|
| - uint64_t max_file_size) {
|
| - max_ipc_memory_size_ = max_ipc_memory_size;
|
| - max_shared_memory_size_ = max_shared_memory_size;
|
| - max_file_size_ = max_file_size;
|
| - }
|
| -
|
| private:
|
| struct BlobBuildingState {
|
| // |refernced_blob_handles| should be all handles generated from the set
|
| // of |refernced_blob_uuids|.
|
| - BlobBuildingState(
|
| - const std::string& uuid,
|
| - std::set<std::string> referenced_blob_uuids,
|
| - std::vector<std::unique_ptr<BlobDataHandle>>* referenced_blob_handles);
|
| + BlobBuildingState(const std::string& uuid);
|
| ~BlobBuildingState();
|
|
|
| + IPCBlobItemRequestStrategy strategy = IPCBlobItemRequestStrategy::UNKNOWN;
|
| BlobAsyncTransportRequestBuilder request_builder;
|
| BlobDataBuilder data_builder;
|
| std::vector<bool> request_received;
|
| - size_t next_request = 0;
|
| size_t num_fulfilled_requests = 0;
|
| +
|
| + RequestMemoryCallback request_memory_callback;
|
| + ErrorCallback error_callback;
|
| + DoneCallback done_callback;
|
| +
|
| + // Used by shared memory strategy.
|
| + size_t next_request = 0;
|
| std::unique_ptr<base::SharedMemory> shared_memory_block;
|
| // This is the number of requests that have been sent to populate the above
|
| // shared data. We won't ask for more data in shared memory until all
|
| @@ -154,49 +151,56 @@ class STORAGE_EXPORT BlobAsyncBuilderHost {
|
| // Only relevant if num_shared_memory_requests is > 0
|
| size_t current_shared_memory_handle_index = 0;
|
|
|
| - // We save these to double check that the RegisterBlob and StartBuildingBlob
|
| - // messages are in sync.
|
| - std::set<std::string> referenced_blob_uuids;
|
| - // These are the blobs that are referenced in the newly constructed blob.
|
| - // We use these to make sure they stay alive while we create the new blob,
|
| - // and to wait until any blobs that are not done building are fully
|
| - // constructed.
|
| - std::vector<std::unique_ptr<BlobDataHandle>> referenced_blob_handles;
|
| -
|
| - // These are the number of blobs we're waiting for before we can start
|
| - // building.
|
| - size_t num_referenced_blobs_building = 0;
|
| -
|
| - BlobAsyncBuilderHost::RequestMemoryCallback request_memory_callback;
|
| + // Used by file strategy.
|
| + std::vector<scoped_refptr<ShareableFileReference>> files;
|
| };
|
|
|
| typedef std::map<std::string, std::unique_ptr<BlobBuildingState>>
|
| AsyncBlobMap;
|
|
|
| - // This is the 'main loop' of our memory requests to the renderer.
|
| - BlobTransportResult ContinueBlobMemoryRequests(const std::string& uuid,
|
| - BlobStorageContext* context);
|
| + BlobTransportResult StartRequests(const std::string& uuid,
|
| + BlobBuildingState* state,
|
| + BlobStorageContext* context);
|
|
|
| - // This is our callback for when we want to finish the blob and we're waiting
|
| - // for blobs we reference to be built. When the last callback occurs, we
|
| - // complete the blob and erase our internal state.
|
| - void ReferencedBlobFinished(const std::string& uuid,
|
| + void OnCanStartBuildingBlob(const std::string& uuid,
|
| base::WeakPtr<BlobStorageContext> context,
|
| - bool construction_success,
|
| + bool success,
|
| IPCBlobCreationCancelCode reason);
|
|
|
| + void SendIPCRequests(BlobBuildingState* state, BlobStorageContext* context);
|
| + BlobTransportResult OnIPCResponses(
|
| + const std::string& uuid,
|
| + BlobBuildingState* state,
|
| + const std::vector<BlobItemBytesResponse>& responses,
|
| + BlobStorageContext* context);
|
| +
|
| + // This is the 'main loop' of our memory requests to the renderer.
|
| + BlobTransportResult ContinueSharedMemoryRequests(const std::string& uuid,
|
| + BlobBuildingState* state,
|
| + BlobStorageContext* context);
|
| +
|
| + BlobTransportResult OnSharedMemoryResponses(
|
| + const std::string& uuid,
|
| + BlobBuildingState* state,
|
| + const std::vector<BlobItemBytesResponse>& responses,
|
| + BlobStorageContext* context);
|
| +
|
| + void OnFileCreated(const std::string& uuid,
|
| + size_t handle_index,
|
| + BlobMemoryController::FileCreationInfo file_info);
|
| +
|
| + BlobTransportResult OnFileResponses(
|
| + const std::string& uuid,
|
| + BlobBuildingState* state,
|
| + const std::vector<BlobItemBytesResponse>& responses,
|
| + BlobStorageContext* context);
|
| +
|
| // This finishes creating the blob in the context, decrements blob references
|
| // that we were holding during construction, and erases our state.
|
| void FinishBuildingBlob(BlobBuildingState* state,
|
| BlobStorageContext* context);
|
|
|
| AsyncBlobMap async_blob_map_;
|
| -
|
| - // Here for testing.
|
| - size_t max_ipc_memory_size_ = kBlobStorageIPCThresholdBytes;
|
| - size_t max_shared_memory_size_ = kBlobStorageMaxSharedMemoryBytes;
|
| - uint64_t max_file_size_ = kBlobStorageMaxFileSizeBytes;
|
| -
|
| base::WeakPtrFactory<BlobAsyncBuilderHost> ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlobAsyncBuilderHost);
|
|
|