X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fmodules%2Fwebdatabase%2FDatabaseContext.h;h=62e7a595df2ef292392463c8b7c66bfb9602fbe0;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=f8e11abff1cb23ad4614f5dd3a755c68fc1e5085;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.h b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.h
index f8e11ab..62e7a59 100644
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.h
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseContext.h
@@ -29,7 +29,8 @@
 #define DatabaseContext_h
 
 #include "core/dom/ActiveDOMObject.h"
-#include "heap/Handle.h"
+#include "core/workers/WorkerGlobalScope.h"
+#include "platform/heap/Handle.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/ThreadSafeRefCounted.h"
 
@@ -38,12 +39,15 @@ namespace WebCore {
 class Database;
 class DatabaseBackendBase;
 class DatabaseContext;
-class DatabaseTaskSynchronizer;
+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;
 
@@ -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;