| Index: webkit/glue/resource_request_body.h
|
| ===================================================================
|
| --- webkit/glue/resource_request_body.h (revision 183651)
|
| +++ webkit/glue/resource_request_body.h (working copy)
|
| @@ -5,6 +5,7 @@
|
| #ifndef WEBKIT_GLUE_RESOURCE_REQUEST_BODY_H_
|
| #define WEBKIT_GLUE_RESOURCE_REQUEST_BODY_H_
|
|
|
| +#include <string>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| @@ -27,7 +28,7 @@
|
| }
|
|
|
| namespace webkit_blob {
|
| -class BlobStorageController;
|
| +class BlobStorageContext;
|
| }
|
|
|
| namespace webkit_glue {
|
| @@ -46,7 +47,7 @@
|
| void AppendFileRange(const base::FilePath& file_path,
|
| uint64 offset, uint64 length,
|
| const base::Time& expected_modification_time);
|
| - void AppendBlob(const GURL& blob_url);
|
| + void AppendBlob(const std::string& uuid);
|
| void AppendFileSystemFileRange(const GURL& url, uint64 offset, uint64 length,
|
| const base::Time& expected_modification_time);
|
|
|
| @@ -56,7 +57,7 @@
|
| // |file_task_runner| is used to perform file operations when the data gets
|
| // uploaded.
|
| net::UploadDataStream* ResolveElementsAndCreateUploadDataStream(
|
| - webkit_blob::BlobStorageController* blob_controller,
|
| + webkit_blob::BlobStorageContext* blob_context,
|
| fileapi::FileSystemContext* file_system_context,
|
| base::TaskRunner* file_task_runner);
|
|
|
| @@ -78,8 +79,8 @@
|
|
|
| // Resolves the |blob_url| using |blob_controller| and appends resolved
|
| // items to |resolved_elements|.
|
| - void ResolveBlobReference(webkit_blob::BlobStorageController* blob_controller,
|
| - const GURL& blob_url,
|
| + void ResolveBlobReference(webkit_blob::BlobStorageContext* blob_context,
|
| + const std::string& uuid,
|
| std::vector<const Element*>* resolved_elements);
|
|
|
| std::vector<Element> elements_;
|
|
|