Reland: [IndexedDB] Delete callbacks state on worker thread exit.

content/child/indexed_db/indexed_db_dispatcher.cc

 // Copyright 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.
 
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 
 #include <utility>
 
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
@@ skipping 43 matching lines @@
   g_idb_dispatcher_tls.Pointer()->Set(this);
 }
 
 IndexedDBDispatcher::~IndexedDBDispatcher() {
   // Clear any pending callbacks - which may result in dispatch requests -
   // before marking the dispatcher as deleted.
   pending_callbacks_.Clear();
 
   DCHECK(pending_callbacks_.IsEmpty());
 
+  in_destructor_ = true;
+  mojo_owned_callback_state_.clear();
+  mojo_owned_database_callback_state_.clear();
+
   g_idb_dispatcher_tls.Pointer()->Set(kHasBeenDeleted);
 }
 
 IndexedDBDispatcher* IndexedDBDispatcher::ThreadSpecificInstance(
     ThreadSafeSender* thread_safe_sender) {
   if (g_idb_dispatcher_tls.Pointer()->Get() == kHasBeenDeleted) {
     NOTREACHED() << "Re-instantiating TLS IndexedDBDispatcher.";
     g_idb_dispatcher_tls.Pointer()->Set(NULL);
   }
   if (g_idb_dispatcher_tls.Pointer()->Get())
@@ skipping 115 matching lines @@
   DCHECK(!base::ContainsKey(cursors_, ipc_cursor_id));
   cursors_[ipc_cursor_id] = cursor;
 }
 
 void IndexedDBDispatcher::CursorDestroyed(int32_t ipc_cursor_id) {
   cursors_.erase(ipc_cursor_id);
 }
 
 void IndexedDBDispatcher::RegisterMojoOwnedCallbacks(
     IndexedDBCallbacksImpl::InternalState* callbacks) {
-  mojo_owned_callback_state_.insert(callbacks);
+  mojo_owned_callback_state_[callbacks] = base::WrapUnique(callbacks);
 }
 
 void IndexedDBDispatcher::UnregisterMojoOwnedCallbacks(
     IndexedDBCallbacksImpl::InternalState* callbacks) {
-  DCHECK(base::ContainsValue(mojo_owned_callback_state_, callbacks));
-  mojo_owned_callback_state_.erase(callbacks);
+  if (in_destructor_)
+    return;
+
+  auto it = mojo_owned_callback_state_.find(callbacks);
+  DCHECK(it != mojo_owned_callback_state_.end());
+  it->second.release();
+  mojo_owned_callback_state_.erase(it);
 }
 
 void IndexedDBDispatcher::RegisterMojoOwnedDatabaseCallbacks(
     blink::WebIDBDatabaseCallbacks* callbacks) {
-  mojo_owned_database_callback_state_.insert(callbacks);
+  mojo_owned_database_callback_state_[callbacks] = base::WrapUnique(callbacks);
 }
 
 void IndexedDBDispatcher::UnregisterMojoOwnedDatabaseCallbacks(
     blink::WebIDBDatabaseCallbacks* callbacks) {
-  DCHECK(base::ContainsValue(mojo_owned_database_callback_state_, callbacks));
-  mojo_owned_database_callback_state_.erase(callbacks);
+  if (in_destructor_)
+    return;
+
+  auto it = mojo_owned_database_callback_state_.find(callbacks);
+  DCHECK(it != mojo_owned_database_callback_state_.end());
+  it->second.release();
+  mojo_owned_database_callback_state_.erase(it);
 }
 
 // Populate some WebIDBValue members (data & blob info) from the supplied
 // value message (IndexedDBMsg_Value or one that includes it).
 template <class IndexedDBMsgValueType>
 static void PrepareWebValue(const IndexedDBMsgValueType& value,
                             WebIDBValue* web_value) {
   if (value.bits.empty())
     return;
 
@@ skipping 131 matching lines @@
   typedef std::map<int32_t, WebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == ipc_exception_cursor_id ||
         i->second->transaction_id() != transaction_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }
 
 }  // namespace content