Remove ActiveDOMObject::willStop, and introduce WorkerGlobalScope::TerminationObserver.

Source/modules/webdatabase/DatabaseContext.h

 /*
  * 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 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef DatabaseContext_h
 #define DatabaseContext_h
 
 #include "core/dom/ActiveDOMObject.h"
+#include "core/workers/WorkerGlobalScope.h"
 #include "platform/heap/Handle.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/ThreadSafeRefCounted.h"
 
 namespace WebCore {
 
 class Database;
 class DatabaseBackendBase;
 class DatabaseContext;
 class TaskSynchronizer;
 class DatabaseThread;
 class ExecutionContext;
 class SecurityOrigin;
 
-class DatabaseContext FINAL : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<DatabaseContext>, public ActiveDOMObject {
+class DatabaseContext FINAL
+    : public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<DatabaseContext>
+    , public ActiveDOMObject
+    , private WorkerGlobalScope::TerminationObserver {
 public:
     friend class DatabaseManager;
 
     static PassRefPtrWillBeRawPtr<DatabaseContext> create(ExecutionContext*);
 
     virtual ~DatabaseContext();
     void trace(Visitor*);
 
     // For life-cycle management (inherited from ActiveDOMObject):
     virtual void contextDestroyed() OVERRIDE;
-    virtual void willStop() OVERRIDE;
     virtual void stop() OVERRIDE;
 
     DatabaseContext* backend();
     DatabaseThread* databaseThread();
 
     void setHasOpenDatabases() { m_hasOpenDatabases = true; }
     void didOpenDatabase(DatabaseBackendBase&);
     void didCloseDatabase(DatabaseBackendBase&);
     // Blocks the caller thread until cleanup tasks are completed.
     void stopDatabases();
 
     bool allowDatabaseAccess() const;
 
     SecurityOrigin* securityOrigin() const;
     bool isContextThread() const;
 
 private:
     explicit DatabaseContext(ExecutionContext*);
 
+    virtual void wasRequestedToTerminate() OVERRIDE;
     void stopSyncDatabases();
 
     RefPtrWillBeMember<DatabaseThread> m_databaseThread;
 #if ENABLE(OILPAN)
     class DatabaseCloser {
     public:
         explicit DatabaseCloser(DatabaseBackendBase& database) : m_database(database) { }
         ~DatabaseCloser();
 
     private:
         DatabaseBackendBase& m_database;
     };
     HeapHashMap<WeakMember<DatabaseBackendBase>, OwnPtr<DatabaseCloser> > m_openSyncDatabases;
 #else
     // The contents of m_openSyncDatabases are raw pointers. It's safe because
     // DatabaseBackendSync is always closed before destruction.
     HashSet<DatabaseBackendBase*> m_openSyncDatabases;
 #endif
     bool m_hasOpenDatabases; // This never changes back to false, even after the database thread is closed.
     bool m_hasRequestedTermination;
 };
 
 } // namespace WebCore
 
 #endif // DatabaseContext_h