New blobstoragecontext for use in the main browser process, not plugged in yet.

webkit/blob/blob_storage_context.h

Index: webkit/blob/blob_storage_context.h
===================================================================
--- webkit/blob/blob_storage_context.h	(revision 189105)
+++ webkit/blob/blob_storage_context.h	(working copy)
@@ -1,16 +1,16 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_BLOB_BLOB_STORAGE_CONTROLLER_H_
-#define WEBKIT_BLOB_BLOB_STORAGE_CONTROLLER_H_
+#ifndef WEBKIT_BLOB_BLOB_STORAGE_CONTEXT_H_
+#define WEBKIT_BLOB_BLOB_STORAGE_CONTEXT_H_
 
 #include <map>
 #include <string>
 
-#include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
-#include "base/process.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/storage/webkit_storage_export.h"
 
@@ -23,60 +23,88 @@
 
 namespace webkit_blob {
 
-// This class handles the logistics of blob Storage within the browser process.
-class WEBKIT_STORAGE_EXPORT BlobStorageController {
+class BlobDataHandle;
+
+// This class handles the logistics of blob Storage within the browser process,
+// and maintains a mapping from blob uuid to the data. The class is single
+// threaded and should  only be used on the IO thread.

[kinuko, 2013/04/30 15:13:27]

nit: extra space between 'should' and 'only'

[michaeln, 2013/04/30 18:14:07]

Done.

+// In chromium, there is one instance per profile.
+class WEBKIT_STORAGE_EXPORT BlobStorageContext
+    : public base::SupportsWeakPtr<BlobStorageContext> {
  public:
-  BlobStorageController();
-  ~BlobStorageController();
+  BlobStorageContext();
+  ~BlobStorageContext();
 
-  void StartBuildingBlob(const GURL& url);
-  void AppendBlobDataItem(const GURL& url, const BlobData::Item& data_item);
-  void FinishBuildingBlob(const GURL& url, const std::string& content_type);
-  void AddFinishedBlob(const GURL& url, const BlobData* blob_data);
-  void CloneBlob(const GURL& url, const GURL& src_url);
-  void RemoveBlob(const GURL& url);
-  BlobData* GetBlobDataFromUrl(const GURL& url);
+  scoped_ptr<BlobDataHandle> GetBlobDataFromUUID(const std::string& uuid);
+  scoped_ptr<BlobDataHandle> GetBlobDataFromPublicURL(const GURL& url);
 
+  // Useful for coining blobs from within the browser process. If the
+  // blob cannot be added due to memory consumption, returns NULL.
+  scoped_ptr<BlobDataHandle> AddFinishedBlob(const BlobData* blob_data);
+
  private:
-  friend class ViewBlobInternalsJob;
+  friend class BlobDataHandle;
+  friend class BlobStorageHost;
 
-  typedef base::hash_map<std::string, scoped_refptr<BlobData> > BlobMap;
-  typedef std::map<BlobData*, int> BlobDataUsageMap;
+  enum EntryFlags {
+    BEING_BUILT = 1 << 0,
+    EXCEEDED_MEMORY = 1 << 1,
+  };
 
-  void AppendStorageItems(BlobData* target_blob_data,
+  struct BlobMapEntry {
+    int refcount;
+    int flags;
+    scoped_refptr<BlobData> data;
+
+    BlobMapEntry();
+    BlobMapEntry(int refcount, int flags, BlobData* data);
+    ~BlobMapEntry();
+  };
+
+  typedef std::map<std::string, BlobMapEntry>
+      BlobMap;
+  typedef std::map<GURL, std::string> BlobURLMap;
+
+  void StartBuildingBlob(const std::string& uuid);
+  void AppendBlobDataItem(const std::string& uuid,
+                          const BlobData::Item& data_item);
+  void FinishBuildingBlob(const std::string& uuid, const std::string& type);
+  void CancelBuildingBlob(const std::string& uuid);
+  void IncrementBlobRefCount(const std::string& uuid);
+  void DecrementBlobRefCount(const std::string& uuid);
+  void RegisterPublicBlobURL(const GURL& url, const std::string& uuid);
+  void RevokePublicBlobURL(const GURL& url);
+
+  bool ExpandStorageItems(BlobData* target_blob_data,
                           BlobData* src_blob_data,
                           uint64 offset,
                           uint64 length);
+  bool AppendBytesItem(BlobData* target_blob_data,
+                       const char* data, int64 length);
   void AppendFileItem(BlobData* target_blob_data,
-                      const base::FilePath& file_path, uint64 offset,
-                      uint64 length,
+                      const base::FilePath& file_path,
+                      uint64 offset, uint64 length,
                       const base::Time& expected_modification_time);
   void AppendFileSystemFileItem(
       BlobData* target_blob_data,
       const GURL& url, uint64 offset, uint64 length,
       const base::Time& expected_modification_time);
 
-  bool RemoveFromMapHelper(BlobMap* map, const GURL& url);
+  bool IsInUse(const std::string& uuid);
+  bool IsBeingBuilt(const std::string& uuid);
+  bool IsUrlRegistered(const GURL& blob_url);
 
-  void IncrementBlobDataUsage(BlobData* blob_data);
-  // Returns true if no longer in use.
-  bool DecrementBlobDataUsage(BlobData* blob_data);
-
   BlobMap blob_map_;
-  BlobMap unfinalized_blob_map_;
+  BlobURLMap public_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
   // items of TYPE_FILE.
   int64 memory_usage_;
 
-  // Multiple urls can refer to the same blob data, this map keeps track of
-  // how many urls refer to a BlobData.
-  BlobDataUsageMap blob_data_usage_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(BlobStorageController);
+  DISALLOW_COPY_AND_ASSIGN(BlobStorageContext);
 };
 
 }  // namespace webkit_blob
 
-#endif  // WEBKIT_BLOB_BLOB_STORAGE_CONTROLLER_H_
+#endif  // WEBKIT_BLOB_BLOB_STORAGE_CONTEXT_H_