[IndexedDB] Refactoring to remove ref ptrs and host transaction ids.

content/browser/indexed_db/indexed_db_transaction.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_TRANSACTION_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <queue>
 #include <set>
 #include <stack>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_observer.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
+#include "url/origin.h"
 
 namespace content {
 
 class BlobWriteCallbackImpl;
 class IndexedDBCursor;
 class IndexedDBDatabaseCallbacks;
 class IndexedDBObservation;
 class IndexedDBObserverChanges;
 
-class CONTENT_EXPORT IndexedDBTransaction
-    : public NON_EXPORTED_BASE(base::RefCounted<IndexedDBTransaction>) {
+class CONTENT_EXPORT IndexedDBTransaction {
  public:
   typedef base::Callback<void(IndexedDBTransaction*)> Operation;
 
   enum State {
     CREATED,     // Created, but not yet started by coordinator.
     STARTED,     // Started by the coordinator.
     COMMITTING,  // In the process of committing, possibly waiting for blobs
                  // to be written.
     FINISHED,    // Either aborted or committed.
   };
 
+  IndexedDBTransaction(

[cmumford, 2016/11/04 23:33:13]

The only reason this is public is so that base::WrapUnique can be used. Can you
return the constructor to the private section and manually create the
unique_ptr? This'll prevent future maintainers from bypassing
IndexedDBConnection::CreateTransaction() by accident.

[dmurph, 2016/11/07 20:05:23]

Done.

+      int64_t id,
+      IndexedDBConnection* connection,
+      const std::set<int64_t>& object_store_ids,
+      blink::WebIDBTransactionMode mode,
+      IndexedDBBackingStore::Transaction* backing_store_transaction);
+  virtual ~IndexedDBTransaction();
+
   virtual void Abort();
   leveldb::Status Commit();
   void Abort(const IndexedDBDatabaseError& error);
 
   // Called by the transaction coordinator when this transaction is unblocked.
   void Start();
 
   blink::WebIDBTransactionMode mode() const { return mode_; }
   const std::set<int64_t>& scope() const { return object_store_ids_; }
 
@@ skipping 22 matching lines @@
   void RecordObserverForLastObservation(int32_t connection_id,
                                         int32_t observer_id);
 
   IndexedDBBackingStore::Transaction* BackingStoreTransaction() {
     return transaction_.get();
   }
   int64_t id() const { return id_; }
 
   IndexedDBDatabase* database() const { return database_.get(); }
   IndexedDBDatabaseCallbacks* callbacks() const { return callbacks_.get(); }
-  IndexedDBConnection* connection() const { return connection_.get(); }
+  IndexedDBConnection* connection() const { return connection_; }
 
   State state() const { return state_; }
   bool IsTimeoutTimerRunning() const { return timeout_timer_.IsRunning(); }
 
   struct Diagnostics {
     base::Time creation_time;
     base::Time start_time;
     int tasks_scheduled;
     int tasks_completed;
   };
 
   const Diagnostics& diagnostics() const { return diagnostics_; }
 
+  void set_size(uint64_t size) { size_ = size; }
+  uint64_t size() const { return size_; }
+
+  void set_origin(url::Origin origin) { origin_ = std::move(origin); }
+  const url::Origin& origin() const { return origin_; }
+
  protected:
-  // Test classes may derive, but most creation should be done via
-  // IndexedDBClassFactory.
-  IndexedDBTransaction(
-      int64_t id,
-      base::WeakPtr<IndexedDBConnection> connection,
-      const std::set<int64_t>& object_store_ids,
-      blink::WebIDBTransactionMode mode,
-      IndexedDBBackingStore::Transaction* backing_store_transaction);
-  virtual ~IndexedDBTransaction();
-
   // May be overridden in tests.
   virtual base::TimeDelta GetInactivityTimeout() const;
 
  private:
   friend class BlobWriteCallbackImpl;
   friend class IndexedDBClassFactory;
+  friend class IndexedDBConnection;
   friend class base::RefCounted<IndexedDBTransaction>;
 
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTestMode, AbortPreemptive);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTestMode, AbortTasks);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTest, NoTimeoutReadOnly);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTest,
                            SchedulePreemptiveTask);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTestMode,
                            ScheduleNormalTask);
   FRIEND_TEST_ALL_PREFIXES(IndexedDBTransactionTest, Timeout);
@@ skipping 10 matching lines @@
   leveldb::Status CommitPhaseTwo();
   void Timeout();
 
   const int64_t id_;
   const std::set<int64_t> object_store_ids_;
   const blink::WebIDBTransactionMode mode_;
 
   bool used_;
   State state_;
   bool commit_pending_;
-  base::WeakPtr<IndexedDBConnection> connection_;
+  // We are owned by the connection object.
+  IndexedDBConnection* connection_;
   scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBDatabase> database_;
 
   // Observers in pending queue do not listen to changes until activated.
   std::vector<std::unique_ptr<IndexedDBObserver>> pending_observers_;
   std::map<int32_t, std::unique_ptr<IndexedDBObserverChanges>>
       connection_changes_map_;
 
+  // Metrics for quota.
+  uint64_t size_;
+  url::Origin origin_;

[jsbell, 2016/11/04 17:48:19]

Can we replace origin_ with connection_->origin() ? Storing this per-TX seems
redundant.

[dmurph, 2016/11/04 22:52:25]

Done.

+
   class TaskQueue {
    public:
     TaskQueue();
     ~TaskQueue();
     bool empty() const { return queue_.empty(); }
     void push(Operation task) { queue_.push(task); }
     Operation pop();
     void clear();
 
    private:
@@ skipping 28 matching lines @@
   int pending_preemptive_events_;
 
   std::set<IndexedDBCursor*> open_cursors_;
 
   // This timer is started after requests have been processed. If no subsequent
   // requests are processed before the timer fires, assume the script is
   // unresponsive and abort to unblock the transaction queue.
   base::OneShotTimer timeout_timer_;
 
   Diagnostics diagnostics_;
+
+  base::WeakPtrFactory<IndexedDBTransaction> ptr_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_