Replace ActiveDOMObjects in modules/indexeddb/ with ContextLifecycleObservers

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 50 matching lines @@
 const char IDBDatabase::objectStoreDeletedErrorMessage[] = "The object store has been deleted.";
 const char IDBDatabase::requestNotFinishedErrorMessage[] = "The request has not finished.";
 const char IDBDatabase::sourceDeletedErrorMessage[] = "The cursor's source or effective object store has been deleted.";
 const char IDBDatabase::transactionInactiveErrorMessage[] = "The transaction is not active.";
 const char IDBDatabase::transactionFinishedErrorMessage[] = "The transaction has finished.";
 const char IDBDatabase::transactionReadOnlyErrorMessage[] = "The transaction is read-only.";
 const char IDBDatabase::databaseClosedErrorMessage[] = "The database connection is closed.";
 
 IDBDatabase* IDBDatabase::create(ExecutionContext* context, PassOwnPtr<WebIDBDatabase> database, IDBDatabaseCallbacks* callbacks)
 {
-    IDBDatabase* idbDatabase = new IDBDatabase(context, database, callbacks);
-    idbDatabase->suspendIfNeeded();
-    return idbDatabase;
+    return new IDBDatabase(context, database, callbacks);
 }
 
 IDBDatabase::IDBDatabase(ExecutionContext* context, PassOwnPtr<WebIDBDatabase> backend, IDBDatabaseCallbacks* callbacks)
-    : ActiveDOMObject(context)
+    : ContextLifecycleObserver(context)
     , m_backend(backend)
     , m_databaseCallbacks(callbacks)
 {
     m_databaseCallbacks->connect(this);
 }
 
 IDBDatabase::~IDBDatabase()
 {
     if (!m_closePending && m_backend)
         m_backend->close();
 }
 
 DEFINE_TRACE(IDBDatabase)
 {
     visitor->trace(m_versionChangeTransaction);
     visitor->trace(m_transactions);
     visitor->trace(m_enqueuedEvents);
     visitor->trace(m_databaseCallbacks);
     RefCountedGarbageCollectedEventTargetWithInlineData<IDBDatabase>::trace(visitor);
-    ActiveDOMObject::trace(visitor);
+    ContextLifecycleObserver::trace(visitor);
 }
 
 int64_t IDBDatabase::nextTransactionId()
 {
     // Only keep a 32-bit counter to allow ports to use the other 32
     // bits of the id.
     static int currentTransactionId = 0;
     return atomicIncrement(&currentTransactionId);
 }
 
@@ skipping 230 matching lines @@
 void IDBDatabase::closeConnection()
 {
     ASSERT(m_closePending);
     ASSERT(m_transactions.isEmpty());
 
     if (m_backend) {
         m_backend->close();
         m_backend.clear();
     }
 
-    if (m_contextStopped || !executionContext())
+    if (!executionContext())
         return;
 
     EventQueue* eventQueue = executionContext()->eventQueue();
     // 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());
         ASSERT_UNUSED(removed, removed);
     }
 }
 
 void IDBDatabase::onVersionChange(int64_t oldVersion, int64_t newVersion)
 {
     IDB_TRACE("IDBDatabase::onVersionChange");
-    if (m_contextStopped || !executionContext())
+    if (!executionContext())
         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(PassRefPtrWillBeRawPtr<Event> event)
 {
-    ASSERT(!m_contextStopped);
     ASSERT(executionContext());
     EventQueue* eventQueue = executionContext()->eventQueue();
     event->setTarget(this);
     eventQueue->enqueueEvent(event.get());
     m_enqueuedEvents.append(event);
 }
 
 DispatchEventResult IDBDatabase::dispatchEventInternal(PassRefPtrWillBeRawPtr<Event> event)
 {
     IDB_TRACE("IDBDatabase::dispatchEvent");
-    if (m_contextStopped || !executionContext())
+    if (!executionContext())
         return DispatchEventResult::CanceledBeforeDispatch;
     ASSERT(event->type() == EventTypeNames::versionchange || event->type() == EventTypeNames::close);
     for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
         if (m_enqueuedEvents[i].get() == event.get())
             m_enqueuedEvents.remove(i);
     }
 
     DispatchEventResult dispatchResult = EventTarget::dispatchEventInternal(event.get());
     if (event->type() == EventTypeNames::versionchange && !m_closePending && m_backend)
         m_backend->versionChangeIgnored();
     return dispatchResult;
 }
 
 int64_t IDBDatabase::findObjectStoreId(const String& name) const
 {
     for (const auto& it : m_metadata.objectStores) {
         if (it.value.name == name) {
             ASSERT(it.key != IDBObjectStoreMetadata::InvalidId);
             return it.key;
         }
     }
     return IDBObjectStoreMetadata::InvalidId;
 }
 
 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() && executionContext();
 }
 
-void IDBDatabase::stop()
+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.clear();
     }
 }
 
 const AtomicString& IDBDatabase::interfaceName() const
 {
     return EventTargetNames::IDBDatabase;
 }
 
 ExecutionContext* IDBDatabase::executionContext() const
 {
-    return ActiveDOMObject::executionContext();
+    return ContextLifecycleObserver::executionContext();
 }
 
 void IDBDatabase::recordApiCallsHistogram(IndexedDatabaseMethods method)
 {
     DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, apiCallsHistogram, new EnumerationHistogram("WebCore.IndexedDB.FrontEndAPICalls", IDBMethodsMax));
     apiCallsHistogram.count(method);
 }
 
 } // namespace blink