Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.cpp b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.cpp
index eb576ea..2428f8a 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.cpp
+++ b/src/third_party/WebKit/Source/modules/webdatabase/DatabaseClient.cpp
@@ -29,12 +29,11 @@
  */
 
 #include "config.h"
-#include "DatabaseClient.h"
+#include "modules/webdatabase/DatabaseClient.h"
 
 #include "core/dom/Document.h"
 #include "core/inspector/InspectorController.h"
 #include "core/page/Page.h"
-#include "core/workers/WorkerGlobalScope.h"
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/InspectorDatabaseAgent.h"
 
@@ -46,11 +45,7 @@ DatabaseClient::DatabaseClient()
 
 DatabaseClient* DatabaseClient::from(ExecutionContext* context)
 {
-    if (context->isDocument()) {
-        return static_cast<DatabaseClient*>(WillBeHeapSupplement<Page>::from(toDocument(context)->page(), supplementName()));
-    }
-    ASSERT(context->isWorkerGlobalScope());
-    return static_cast<DatabaseClient*>(WillBeHeapSupplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName()));
+    return static_cast<DatabaseClient*>(WillBeHeapSupplement<Page>::from(toDocument(context)->page(), supplementName()));
 }
 
 const char* DatabaseClient::supplementName()
@@ -79,9 +74,4 @@ void provideDatabaseClientTo(Page& page, PassOwnPtrWillBeRawPtr<DatabaseClient>
     clientPtr->createInspectorAgentFor(&page);
 }
 
-void provideDatabaseClientToWorker(WorkerClients* workerClients, PassOwnPtrWillBeRawPtr<DatabaseClient> client)
-{
-    workerClients->provideSupplement(DatabaseClient::supplementName(), client);
-}
-
 } // namespace blink