Index: Source/modules/webdatabase/DatabaseContext.h |
diff --git a/Source/modules/webdatabase/DatabaseContext.h b/Source/modules/webdatabase/DatabaseContext.h |
index 9bd33ff0dd6020e885938a1345b84ac97dd83ad0..2343e21af832938c3405afadcf739ddd13933bdf 100644 |
--- a/Source/modules/webdatabase/DatabaseContext.h |
+++ b/Source/modules/webdatabase/DatabaseContext.h |
@@ -46,8 +46,7 @@ class SecurityOrigin; |
class DatabaseContext FINAL |
: public ThreadSafeRefCountedWillBeGarbageCollectedFinalized<DatabaseContext> |
- , public ActiveDOMObject |
- , private WorkerGlobalScope::TerminationObserver { |
+ , public ActiveDOMObject { |
public: |
friend class DatabaseManager; |
@@ -64,8 +63,6 @@ public: |
DatabaseThread* databaseThread(); |
void setHasOpenDatabases() { m_hasOpenDatabases = true; } |
- void didOpenDatabase(DatabaseBackendBase&); |
- void didCloseDatabase(DatabaseBackendBase&); |
// Blocks the caller thread until cleanup tasks are completed. |
void stopDatabases(); |
@@ -77,25 +74,7 @@ public: |
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; |
}; |