[IndexedDB] Closing mojo connections when renderer quits

content/browser/indexed_db/database_impl.cc

 // Copyright 2016 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.
 
 #include "content/browser/indexed_db/database_impl.h"
 
 #include "base/memory/ptr_util.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_dispatcher_host.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/indexed_db_value.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/quota/quota_manager_proxy.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h"
 
 using std::swap;
 
 namespace content {
 
 namespace {
 const char kInvalidBlobUuid[] = "Blob UUID is invalid";
 const char kInvalidBlobFilePath[] = "Blob file path is invalid";
 }  // namespace
 
+// Expect to be created on IO thread, and called/destroyed on IDB thread.
 class DatabaseImpl::IDBThreadHelper {
  public:
   IDBThreadHelper(std::unique_ptr<IndexedDBConnection> connection,
                   const url::Origin& origin,
-                  scoped_refptr<IndexedDBDispatcherHost> dispatcher_host);
+                  scoped_refptr<IndexedDBContextImpl> indexed_db_context);
   ~IDBThreadHelper();
 
+  void ConnectionOpened();
+
   void CreateObjectStore(int64_t transaction_id,
                          int64_t object_store_id,
                          const base::string16& name,
                          const IndexedDBKeyPath& key_path,
                          bool auto_increment);
   void DeleteObjectStore(int64_t transaction_id, int64_t object_store_id);
   void RenameObjectStore(int64_t transaction_id,
                          int64_t object_store_id,
                          const base::string16& new_name);
   void CreateTransaction(int64_t transaction_id,
@@ skipping 73 matching lines @@
                    const base::string16& new_name);
   void Abort(int64_t transaction_id);
   void Commit(int64_t transaction_id);
   void OnGotUsageAndQuotaForCommit(int64_t transaction_id,
                                    storage::QuotaStatusCode status,
                                    int64_t usage,
                                    int64_t quota);
   void AckReceivedBlobs(const std::vector<std::string>& uuids);
 
  private:
-  scoped_refptr<IndexedDBDispatcherHost> dispatcher_host_;
+  scoped_refptr<IndexedDBContextImpl> indexed_db_context_;
   std::unique_ptr<IndexedDBConnection> connection_;
   const url::Origin origin_;
   base::WeakPtrFactory<IDBThreadHelper> weak_factory_;
 };
 
-DatabaseImpl::DatabaseImpl(
-    std::unique_ptr<IndexedDBConnection> connection,
-    const url::Origin& origin,
-    scoped_refptr<IndexedDBDispatcherHost> dispatcher_host)
+DatabaseImpl::DatabaseImpl(std::unique_ptr<IndexedDBConnection> connection,
+                           const url::Origin& origin,
+                           IndexedDBDispatcherHost* dispatcher_host,
+                           scoped_refptr<base::SequencedTaskRunner> idb_runner)
     : dispatcher_host_(dispatcher_host),
       origin_(origin),
-      idb_runner_(base::ThreadTaskRunnerHandle::Get()) {
+      idb_runner_(std::move(idb_runner)) {
+  DCHECK(connection);
   helper_ = new IDBThreadHelper(std::move(connection), origin,
-                                std::move(dispatcher_host));
+                                dispatcher_host->context());
+  idb_runner_->PostTask(FROM_HERE,
+                        base::Bind(&IDBThreadHelper::ConnectionOpened,
+                                   base::Unretained(helper_)));
 }
 
 DatabaseImpl::~DatabaseImpl() {
   idb_runner_->DeleteSoon(FROM_HERE, helper_);
 }
 
 void DatabaseImpl::CreateObjectStore(int64_t transaction_id,
                                      int64_t object_store_id,
                                      const base::string16& name,
                                      const IndexedDBKeyPath& key_path,
@@ skipping 61 matching lines @@
                                    base::Unretained(helper_), observers));
 }
 
 void DatabaseImpl::Get(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     bool key_only,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
   idb_runner_->PostTask(
       FROM_HERE, base::Bind(&IDBThreadHelper::Get, base::Unretained(helper_),
                             transaction_id, object_store_id, index_id,
                             key_range, key_only, base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::GetAll(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     bool key_only,
     int64_t max_count,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::GetAll, base::Unretained(helper_),
                  transaction_id, object_store_id, index_id, key_range, key_only,
                  max_count, base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::Put(
     int64_t transaction_id,
     int64_t object_store_id,
@@ skipping 31 matching lines @@
                                        info->file->name, info->mime_type);
       if (info->size != -1) {
         blob_info[i].set_last_modified(info->file->last_modified);
         blob_info[i].set_size(info->size);
       }
     } else {
       blob_info[i] = IndexedDBBlobInfo(info->uuid, info->mime_type, info->size);
     }
   }
 
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
 
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::Put, base::Unretained(helper_),
                  transaction_id, object_store_id, base::Passed(&value),
                  base::Passed(&handles), base::Passed(&blob_info), key, mode,
                  index_keys, base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::SetIndexKeys(
@@ skipping 18 matching lines @@
 
 void DatabaseImpl::OpenCursor(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     blink::WebIDBCursorDirection direction,
     bool key_only,
     blink::WebIDBTaskType task_type,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::OpenCursor, base::Unretained(helper_),
                  transaction_id, object_store_id, index_id, key_range,
                  direction, key_only, task_type, base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::Count(
     int64_t transaction_id,
     int64_t object_store_id,
     int64_t index_id,
     const IndexedDBKeyRange& key_range,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
   idb_runner_->PostTask(
       FROM_HERE, base::Bind(&IDBThreadHelper::Count, base::Unretained(helper_),
                             transaction_id, object_store_id, index_id,
                             key_range, base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::DeleteRange(
     int64_t transaction_id,
     int64_t object_store_id,
     const IndexedDBKeyRange& key_range,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::DeleteRange, base::Unretained(helper_),
                  transaction_id, object_store_id, key_range,
                  base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::Clear(
     int64_t transaction_id,
     int64_t object_store_id,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info) {
-  scoped_refptr<IndexedDBCallbacks> callbacks(new IndexedDBCallbacks(
-      dispatcher_host_.get(), origin_, std::move(callbacks_info)));
+  scoped_refptr<IndexedDBCallbacks> callbacks(
+      new IndexedDBCallbacks(dispatcher_host_->AsWeakPtr(), origin_,
+                             std::move(callbacks_info), idb_runner_));
   idb_runner_->PostTask(
       FROM_HERE,
       base::Bind(&IDBThreadHelper::Clear, base::Unretained(helper_),
                  transaction_id, object_store_id, base::Passed(&callbacks)));
 }
 
 void DatabaseImpl::CreateIndex(int64_t transaction_id,
                                int64_t object_store_id,
                                int64_t index_id,
                                const base::string16& name,
@@ skipping 39 matching lines @@
 }
 
 void DatabaseImpl::AckReceivedBlobs(const std::vector<std::string>& uuids) {
   for (const auto& uuid : uuids)
     dispatcher_host_->DropBlobData(uuid);
 }
 
 DatabaseImpl::IDBThreadHelper::IDBThreadHelper(
     std::unique_ptr<IndexedDBConnection> connection,
     const url::Origin& origin,
-    scoped_refptr<IndexedDBDispatcherHost> dispatcher_host)
-    : dispatcher_host_(std::move(dispatcher_host)),
+    scoped_refptr<IndexedDBContextImpl> indexed_db_context)
+    : indexed_db_context_(indexed_db_context),
       connection_(std::move(connection)),
       origin_(origin),
-      weak_factory_(this) {
-  dispatcher_host_->context()->ConnectionOpened(origin_, connection.get());
+      weak_factory_(this) {}
+
+DatabaseImpl::IDBThreadHelper::~IDBThreadHelper() {
+  LOG(ERROR) << "in destructor";
+  LOG(ERROR) << "object " << connection_.get();
+  LOG(ERROR) << "connected: " << connection_->IsConnected();
+  if (connection_->IsConnected())
+    connection_->Close();
+  LOG(ERROR) << "about to call closed";

[Reilly Grant (use Gerrit), 2017/03/11 00:31:40]

Leftover logging.

[dmurph, 2017/03/29 18:40:24]

Done.

+  indexed_db_context_->ConnectionClosed(origin_, connection_.get());
 }
 
-DatabaseImpl::IDBThreadHelper::~IDBThreadHelper() {
-  if (connection_->IsConnected())
-    connection_->Close();
-  dispatcher_host_->context()->ConnectionClosed(origin_, connection_.get());
+void DatabaseImpl::IDBThreadHelper::ConnectionOpened() {
+  indexed_db_context_->ConnectionOpened(origin_, connection_.get());
 }
 
 void DatabaseImpl::IDBThreadHelper::CreateObjectStore(
     int64_t transaction_id,
     int64_t object_store_id,
     const base::string16& name,
     const IndexedDBKeyPath& key_path,
     bool auto_increment) {
   if (!connection_->IsConnected())
     return;
@@ skipping 342 matching lines @@
       connection_->GetTransaction(transaction_id);
   if (!transaction)
     return;
 
   // Always allow empty or delete-only transactions.
   if (transaction->size() == 0) {
     connection_->database()->Commit(transaction);
     return;
   }
 
-  dispatcher_host_->context()->quota_manager_proxy()->GetUsageAndQuota(
-      dispatcher_host_->context()->TaskRunner(), origin_.GetURL(),
+  indexed_db_context_->quota_manager_proxy()->GetUsageAndQuota(
+      indexed_db_context_->TaskRunner(), origin_.GetURL(),
       storage::kStorageTypeTemporary,
       base::Bind(&IDBThreadHelper::OnGotUsageAndQuotaForCommit,
                  weak_factory_.GetWeakPtr(), transaction_id));
 }
 
 void DatabaseImpl::IDBThreadHelper::OnGotUsageAndQuotaForCommit(
     int64_t transaction_id,
     storage::QuotaStatusCode status,
     int64_t usage,
     int64_t quota) {
@@ skipping 10 matching lines @@
       usage + transaction->size() <= quota) {
     connection_->database()->Commit(transaction);
   } else {
     connection_->AbortTransaction(
         transaction,
         IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionQuotaError));
   }
 }
 
 }  // namespace content