Reduce SuspendableObjects

third_party/WebKit/Source/modules/webdatabase/DatabaseContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 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 51 matching lines @@
 // we don't succeed in opening any Databases for that context. When we do
 // succeed in opening Databases for this ExecutionContext, the Database
 // will re-use the same DatabaseContext.
 //
 // At Shutdown:
 // ===========
 // During shutdown, the DatabaseContext needs to:
 // 1. "outlive" the ExecutionContext.
 //    - This is needed because the DatabaseContext needs to remove itself from
 //    the
-//      ExecutionContext's SuspendableObject list and ContextLifecycleObserver
+//      ExecutionContext's ContextLifecycleObserver list and
+//      ContextLifecycleObserver
 //      list. This removal needs to be executed on the script's thread. Hence,
 //      we
 //      rely on the ExecutionContext's shutdown process to call
 //      stop() and contextDestroyed() to give us a chance to clean these up from
 //      the script thread.
 //
 // 2. "outlive" the Databases.
 //    - This is because they may make use of the DatabaseContext to execute a
 //      close task and shutdown in an orderly manner. When the Databases are
 //      destructed, they will release the DatabaseContext reference from the
 //      DatabaseThread.
 //
 // During shutdown, the ExecutionContext is shutting down on the script thread
 // while the Databases are shutting down on the DatabaseThread. Hence, there can
 // be a race condition as to whether the ExecutionContext or the Databases
 // destruct first.
 //
 // The Members in the Databases and DatabaseManager will ensure that the
 // DatabaseContext will outlive Database and ExecutionContext regardless of
 // which of the 2 destructs first.
 
 DatabaseContext* DatabaseContext::create(ExecutionContext* context) {
   DatabaseContext* self = new DatabaseContext(context);
   DatabaseManager::manager().registerDatabaseContext(self);
   return self;
 }
 
 DatabaseContext::DatabaseContext(ExecutionContext* context)
-    : SuspendableObject(context),
+    : ContextLifecycleObserver(context),
       m_hasOpenDatabases(false),
       m_hasRequestedTermination(false) {
   DCHECK(isMainThread());
 
-  // SuspendableObject expects this to be called to set internal flags.
-  suspendIfNeeded();
-
   // For debug accounting only. We must do this before we register the
   // instance. The assertions assume this.
   DatabaseManager::manager().didConstructDatabaseContext();
 }
 
 DatabaseContext::~DatabaseContext() {
   // For debug accounting only. We must call this last. The assertions assume
   // this.
   DatabaseManager::manager().didDestructDatabaseContext();
 }
 
 DEFINE_TRACE(DatabaseContext) {
   visitor->trace(m_databaseThread);
-  SuspendableObject::trace(visitor);
+  ContextLifecycleObserver::trace(visitor);
 }
 
 // This is called if the associated ExecutionContext is destructing while
 // we're still associated with it. That's our cue to disassociate and shutdown.
 // To do this, we stop the database and let everything shutdown naturally
 // because the database closing process may still make use of this context.
 // It is not safe to just delete the context here.
 void DatabaseContext::contextDestroyed() {
   stopDatabases();
   DatabaseManager::manager().unregisterDatabaseContext(this);
@@ skipping 49 matching lines @@
 
 SecurityOrigin* DatabaseContext::getSecurityOrigin() const {
   return getExecutionContext()->getSecurityOrigin();
 }
 
 bool DatabaseContext::isContextThread() const {
   return getExecutionContext()->isContextThread();
 }
 
 }  // namespace blink