Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webdatabase / DatabaseClient.h

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.h b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.h
index 3e0b66e..f1da63b 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.h
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.h
@@ -31,19 +31,18 @@
 #ifndef DatabaseClient_h
 #define DatabaseClient_h
 
-#include "core/page/Page.h"
-#include "core/workers/WorkerClients.h"
-#include "heap/Handle.h"
+#include "platform/Supplementable.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 
-namespace WebCore {
+namespace blink {
 
 class Database;
 class ExecutionContext;
 class InspectorDatabaseAgent;
-class WorkerClients;
+class Page;
 
-class DatabaseClient : public Supplement<Page>, public Supplement<WorkerClients> {
+class DatabaseClient : public WillBeHeapSupplement<Page> {
     WTF_MAKE_NONCOPYABLE(DatabaseClient);
 public:
     DatabaseClient();
@@ -62,9 +61,8 @@ private:
     InspectorDatabaseAgent* m_inspectorAgent;
 };
 
-void provideDatabaseClientTo(Page&, PassOwnPtr<DatabaseClient>);
-void provideDatabaseClientToWorker(WorkerClients*, PassOwnPtr<DatabaseClient>);
+void provideDatabaseClientTo(Page&, PassOwnPtrWillBeRawPtr<DatabaseClient>);
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // DatabaseClient_h