IndexedDB: Remove m_contextStopped from ActiveDOMObjecs

third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 379 matching lines @@
   DCHECK(m_transactions.isEmpty());
 
   if (m_backend) {
     m_backend->close();
     m_backend.reset();
   }
 
   if (m_databaseCallbacks)
     m_databaseCallbacks->detachWebCallbacks();
 
-  if (m_contextStopped || !getExecutionContext())
+  if (!getExecutionContext())
     return;
 
   EventQueue* eventQueue = getExecutionContext()->getEventQueue();
   // Remove any pending versionchange events scheduled to fire on this
   // connection. They would have been scheduled by the backend when another
   // connection attempted an upgrade, but the frontend connection is being
   // closed before they could fire.
   for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
     bool removed = eventQueue->cancelEvent(m_enqueuedEvents[i].get());
     DCHECK(removed);
   }
 }
 
 void IDBDatabase::onVersionChange(int64_t oldVersion, int64_t newVersion) {
   IDB_TRACE("IDBDatabase::onVersionChange");
-  if (m_contextStopped || !getExecutionContext())
+  if (!getExecutionContext())
     return;
 
   if (m_closePending) {
     // If we're pending, that means there's a busy transaction. We won't
     // fire 'versionchange' but since we're not closing immediately the
     // back-end should still send out 'blocked'.
     m_backend->versionChangeIgnored();
     return;
   }
 
   Nullable<unsigned long long> newVersionNullable =
       (newVersion == IDBDatabaseMetadata::NoVersion)
           ? Nullable<unsigned long long>()
           : Nullable<unsigned long long>(newVersion);
   enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::versionchange,
                                              oldVersion, newVersionNullable));
 }
 
 void IDBDatabase::enqueueEvent(Event* event) {
-  DCHECK(!m_contextStopped);
   DCHECK(getExecutionContext());
   EventQueue* eventQueue = getExecutionContext()->getEventQueue();
   event->setTarget(this);
   eventQueue->enqueueEvent(event);
   m_enqueuedEvents.append(event);
 }
 
 DispatchEventResult IDBDatabase::dispatchEventInternal(Event* event) {
   IDB_TRACE("IDBDatabase::dispatchEvent");
-  if (m_contextStopped || !getExecutionContext())
+  if (!getExecutionContext())
     return DispatchEventResult::CanceledBeforeDispatch;
   DCHECK(event->type() == EventTypeNames::versionchange ||
          event->type() == EventTypeNames::close);
   for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
     if (m_enqueuedEvents[i].get() == event)
       m_enqueuedEvents.remove(i);
   }
 
   DispatchEventResult dispatchResult =
       EventTarget::dispatchEventInternal(event);
@@ skipping 52 matching lines @@
       << "Object store metadata reverted when versionchange transaction is "
          "still active";
   DCHECK(oldMetadata.get());
   m_metadata.objectStores.set(oldMetadata->id, std::move(oldMetadata));
 }
 
 bool IDBDatabase::hasPendingActivity() const {
   // The script wrapper must not be collected before the object is closed or
   // we can't fire a "versionchange" event to let script manually close the
   // connection.
-  return !m_closePending && hasEventListeners() && !m_contextStopped;
+  return !m_closePending && hasEventListeners() && getExecutionContext();
 }
 
 void IDBDatabase::contextDestroyed() {
-  m_contextStopped = true;
-
   // Immediately close the connection to the back end. Don't attempt a
   // normal close() since that may wait on transactions which require a
   // round trip to the back-end to abort.
   if (m_backend) {
     m_backend->close();
     m_backend.reset();
   }
 
   if (m_databaseCallbacks)
     m_databaseCallbacks->detachWebCallbacks();
 }
 
 const AtomicString& IDBDatabase::interfaceName() const {
   return EventTargetNames::IDBDatabase;
 }
 
 ExecutionContext* IDBDatabase::getExecutionContext() const {
   return ActiveDOMObject::getExecutionContext();
 }
 
 void IDBDatabase::recordApiCallsHistogram(IndexedDatabaseMethods method) {
   DEFINE_THREAD_SAFE_STATIC_LOCAL(
       EnumerationHistogram, apiCallsHistogram,
       new EnumerationHistogram("WebCore.IndexedDB.FrontEndAPICalls",
                                IDBMethodsMax));
   apiCallsHistogram.count(method);
 }
 
 }  // namespace blink