| Index: storage/browser/blob/blob_data_handle.h
|
| diff --git a/webkit/browser/blob/blob_data_handle.h b/storage/browser/blob/blob_data_handle.h
|
| similarity index 84%
|
| rename from webkit/browser/blob/blob_data_handle.h
|
| rename to storage/browser/blob/blob_data_handle.h
|
| index 917a0b38e8e9a588bf347bbfc3c1fe19217f2907..3532aa1c34d80ebc0472296caa44bc73849e2b6a 100644
|
| --- a/webkit/browser/blob/blob_data_handle.h
|
| +++ b/storage/browser/blob/blob_data_handle.h
|
| @@ -10,13 +10,13 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/supports_user_data.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| +#include "storage/common/storage_export.h"
|
|
|
| namespace base {
|
| class SequencedTaskRunner;
|
| }
|
|
|
| -namespace webkit_blob {
|
| +namespace storage {
|
|
|
| class BlobData;
|
| class BlobStorageContext;
|
| @@ -25,12 +25,11 @@ class BlobStorageContext;
|
| // the underlying BlobData and its uuid remain in BlobStorageContext's
|
| // collection for the duration. This object has delete semantics and
|
| // maybe deleted on any thread.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT BlobDataHandle
|
| - : public base::SupportsUserData::Data {
|
| +class STORAGE_EXPORT BlobDataHandle : public base::SupportsUserData::Data {
|
| public:
|
| BlobDataHandle(const BlobDataHandle& other); // May be copied on any thread.
|
| virtual ~BlobDataHandle(); // Maybe be deleted on any thread.
|
| - BlobData* data() const; // May only be accessed on the IO thread.
|
| + BlobData* data() const; // May only be accessed on the IO thread.
|
|
|
| std::string uuid() const; // May be accessed on any thread.
|
|
|
| @@ -59,13 +58,14 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobDataHandle
|
| };
|
|
|
| friend class BlobStorageContext;
|
| - BlobDataHandle(BlobData* blob_data, BlobStorageContext* context,
|
| + BlobDataHandle(BlobData* blob_data,
|
| + BlobStorageContext* context,
|
| base::SequencedTaskRunner* task_runner);
|
|
|
| scoped_refptr<base::SequencedTaskRunner> io_task_runner_;
|
| scoped_refptr<BlobDataHandleShared> shared_;
|
| };
|
|
|
| -} // namespace webkit_blob
|
| +} // namespace storage
|
|
|
| #endif // WEBKIT_BROWSER_BLOB_BLOB_DATA_HANDLE_H_
|
|
|