Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1359)

Unified Diff: Source/modules/webdatabase/DatabaseContext.h

Issue 248523003: Remove ActiveDOMObject::willStop, and introduce WorkerGlobalScope::TerminationObserver. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Linux build fix, comment update Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/workers/WorkerThread.cpp ('k') | Source/modules/webdatabase/DatabaseContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webdatabase/DatabaseContext.h
diff --git a/Source/modules/webdatabase/DatabaseContext.h b/Source/modules/webdatabase/DatabaseContext.h
index 359898e3358b6461cf35e8208d9931fd0cd06a5e..62e7a595df2ef292392463c8b7c66bfb9602fbe0 100644
--- a/Source/modules/webdatabase/DatabaseContext.h
+++ b/Source/modules/webdatabase/DatabaseContext.h
@@ -29,6 +29,7 @@
#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"
@@ -43,7 +44,10 @@ 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;
@@ -54,7 +58,6 @@ public:
// For life-cycle management (inherited from ActiveDOMObject):
virtual void contextDestroyed() OVERRIDE;
- virtual void willStop() OVERRIDE;
virtual void stop() OVERRIDE;
DatabaseContext* backend();
@@ -74,6 +77,7 @@ public:
private:
explicit DatabaseContext(ExecutionContext*);
+ virtual void wasRequestedToTerminate() OVERRIDE;
void stopSyncDatabases();
RefPtrWillBeMember<DatabaseThread> m_databaseThread;
« no previous file with comments | « Source/core/workers/WorkerThread.cpp ('k') | Source/modules/webdatabase/DatabaseContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698