| Index: webkit/browser/blob/blob_storage_context.h
|
| diff --git a/webkit/browser/blob/blob_storage_context.h b/webkit/browser/blob/blob_storage_context.h
|
| index c9747aea3eddda4b647660432dd49f696ebe76e8..eec1fee8c23089a45b761b79e3f9e785d28f58fd 100644
|
| --- a/webkit/browser/blob/blob_storage_context.h
|
| +++ b/webkit/browser/blob/blob_storage_context.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "webkit/browser/blob/blob_data_handle.h"
|
| #include "webkit/browser/webkit_storage_browser_export.h"
|
| #include "webkit/common/blob/blob_data.h"
|
|
|
| @@ -42,9 +43,13 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
|
| // blob cannot be added due to memory consumption, returns NULL.
|
| scoped_ptr<BlobDataHandle> AddFinishedBlob(const BlobData* blob_data);
|
|
|
| + // Temporary support for mapping oldstyle blobUrls to new style uuids.
|
| + std::string LookupUuidFromDeprecatedURL(const GURL& url);
|
| +
|
| private:
|
| friend class BlobDataHandle;
|
| friend class BlobStorageHost;
|
| + friend class ViewBlobInternalsJob;
|
|
|
| enum EntryFlags {
|
| BEING_BUILT = 1 << 0,
|
| @@ -75,6 +80,11 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
|
| void RegisterPublicBlobURL(const GURL& url, const std::string& uuid);
|
| void RevokePublicBlobURL(const GURL& url);
|
|
|
| + // Temporary support for mapping old style blobUrls to new style uuids.
|
| + void DeprecatedRegisterPrivateBlobURL(const GURL& url,
|
| + const std::string& uuid);
|
| + void DeprecatedRevokePrivateBlobURL(const GURL& url);
|
| +
|
| bool ExpandStorageItems(BlobData* target_blob_data,
|
| BlobData* src_blob_data,
|
| uint64 offset,
|
| @@ -96,6 +106,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT BlobStorageContext
|
|
|
| BlobMap blob_map_;
|
| BlobURLMap public_blob_urls_;
|
| + BlobURLMap deprecated_blob_urls_;
|
|
|
| // Used to keep track of how much memory is being utitlized for blob data,
|
| // we count only the items of TYPE_DATA which are held in memory and not
|
|
|