More changes to support incognito mode in the IDB/Blob code.

content/browser/indexed_db/indexed_db_backing_store.h

 // 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 CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 89 matching lines @@
       std::string* data_loss_message,
       bool* disk_full,
       LevelDBFactory* leveldb_factory,
       base::TaskRunner* task_runner,
       bool clean_journal);
   static scoped_refptr<IndexedDBBackingStore> OpenInMemory(
       const GURL& origin_url,
       base::TaskRunner* task_runner);
   static scoped_refptr<IndexedDBBackingStore> OpenInMemory(
       const GURL& origin_url,
-      LevelDBFactory* level_db_factory,
+      LevelDBFactory* leveldb_factory,
       base::TaskRunner* task_runner);
 
   void GrantChildProcessPermissions(int child_process_id);
 
   // Compact is public for testing.
   virtual void Compact();
   virtual std::vector<base::string16> GetDatabaseNames(leveldb::Status*);
   virtual leveldb::Status GetIDBDatabaseMetaData(
       const base::string16& name,
       IndexedDBDatabaseMetadata* metadata,
@@ skipping 229 matching lines @@
       leveldb::Status*);
   virtual scoped_ptr<Cursor> OpenIndexCursor(
       IndexedDBBackingStore::Transaction* transaction,
       int64 database_id,
       int64 object_store_id,
       int64 index_id,
       const IndexedDBKeyRange& key_range,
       indexed_db::CursorDirection,
       leveldb::Status*);
 
+  class BlobChangeRecord {
+   public:
+    BlobChangeRecord(const std::string& key, int64 object_store_id);
+    ~BlobChangeRecord();
+    const std::string& key() const { return key_; }
+    int64 object_store_id() const { return object_store_id_; }
+    void SetBlobInfo(std::vector<IndexedDBBlobInfo>* blob_info);
+    std::vector<IndexedDBBlobInfo>& mutable_blob_info() { return blob_info_; }
+    const std::vector<IndexedDBBlobInfo>& blob_info() const {
+      return blob_info_;
+    }
+    void SetHandles(ScopedVector<webkit_blob::BlobDataHandle>* handles);
+    scoped_ptr<BlobChangeRecord> Copy() const;

[jsbell, 2014/05/05 22:21:23]

Is 'Clone' more common? Dunno.

[ericu, 2014/05/05 23:03:20]

[ericu@orevarmer src]$ git grep '\<Clone()' | wc -l
218
[ericu@orevarmer src]$ git grep '\<Copy()' | wc -l
88

Clone wins; I'll change it.

+
+   private:
+    std::string key_;
+    int64 object_store_id_;
+    std::vector<IndexedDBBlobInfo> blob_info_;
+    ScopedVector<webkit_blob::BlobDataHandle> handles_;
+    DISALLOW_COPY_AND_ASSIGN(BlobChangeRecord);
+  };
+  typedef std::map<std::string, BlobChangeRecord*> BlobChangeMap;
+
   class Transaction {
    public:
     explicit Transaction(IndexedDBBackingStore* backing_store);
     virtual ~Transaction();
     virtual void Begin();
     virtual leveldb::Status Commit();
     virtual void Rollback();
     void Reset() {
       backing_store_ = NULL;
       transaction_ = NULL;
@@ skipping 47 matching lines @@
 
      protected:
       virtual ~ChainedBlobWriter() {}
       friend class base::RefCounted<ChainedBlobWriter>;
     };
     class ChainedBlobWriterImpl;
 
     typedef std::vector<WriteDescriptor> WriteDescriptorVec;
 
    private:
-    class BlobChangeRecord {
-     public:
-      BlobChangeRecord(const std::string& key, int64 object_store_id);
-      ~BlobChangeRecord();
-      const std::string& key() const { return key_; }
-      int64 object_store_id() const { return object_store_id_; }
-      void SetBlobInfo(std::vector<IndexedDBBlobInfo>* blob_info);
-      std::vector<IndexedDBBlobInfo>& mutable_blob_info() { return blob_info_; }
-      void SetHandles(ScopedVector<webkit_blob::BlobDataHandle>* handles);
-
-     private:
-      std::string key_;
-      int64 object_store_id_;
-      std::vector<IndexedDBBlobInfo> blob_info_;
-      ScopedVector<webkit_blob::BlobDataHandle> handles_;
-    };
     class BlobWriteCallbackWrapper;
-    typedef std::map<std::string, BlobChangeRecord*> BlobChangeMap;
 
     // The callback will be called eventually on success or failure.
     void WriteNewBlobs(BlobEntryKeyValuePairVec& new_blob_entries,
                        WriteDescriptorVec& new_files_to_write,
                        scoped_refptr<BlobWriteCallback> callback);
 
     IndexedDBBackingStore* backing_store_;
     scoped_refptr<LevelDBTransaction> transaction_;
     BlobChangeMap blob_change_map_;
+    BlobChangeMap incognito_blob_map_;
     int64 database_id_;
     scoped_refptr<ChainedBlobWriter> chained_blob_writer_;
   };
 
  protected:
   IndexedDBBackingStore(IndexedDBFactory* indexed_db_factory,
                         const GURL& origin_url,
                         const base::FilePath& blob_path,
                         net::URLRequestContext* request_context,
                         scoped_ptr<LevelDBDatabase> db,
                         scoped_ptr<LevelDBComparator> comparator,
                         base::TaskRunner* task_runner);
   virtual ~IndexedDBBackingStore();
   friend class base::RefCounted<IndexedDBBackingStore>;
 
+  bool is_incognito() const { return !indexed_db_factory_; }
+
   virtual bool WriteBlobFile(
       int64 database_id,
       const Transaction::WriteDescriptor& descriptor,
       Transaction::ChainedBlobWriter* chained_blob_writer);
   virtual bool RemoveBlobFile(int64 database_id, int64 key);
   virtual void StartJournalCleaningTimer();
   void CleanPrimaryJournalIgnoreReturn();
 
  private:
   static scoped_refptr<IndexedDBBackingStore> Create(
@@ skipping 32 matching lines @@
   // leveldb backing store to partition data by origin. It is a normalized
   // version of the origin URL with a versioning suffix appended, e.g.
   // "http_localhost_81@1" Since only one origin is stored per backing store
   // this is redundant but necessary for backwards compatibility; the suffix
   // provides for future flexibility.
   const std::string origin_identifier_;
 
   net::URLRequestContext* request_context_;
   base::TaskRunner* task_runner_;
   std::set<int> child_process_ids_granted_;
+  BlobChangeMap incognito_blob_map_;
   base::OneShotTimer<IndexedDBBackingStore> journal_cleaning_timer_;
 
   scoped_ptr<LevelDBDatabase> db_;
   scoped_ptr<LevelDBComparator> comparator_;
   // Whenever blobs are registered in active_blob_registry_, indexed_db_factory_
   // will hold a reference to this backing store.
   IndexedDBActiveBlobRegistry active_blob_registry_;
   base::OneShotTimer<IndexedDBBackingStore> close_timer_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_