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

Unified Diff: Source/modules/webdatabase/DatabaseClient.cpp

Issue 564713002: Web SQL: Remove more worker-related code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix Windows build Created 6 years, 3 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/modules/webdatabase/DatabaseClient.h ('k') | Source/modules/webdatabase/DatabaseContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/webdatabase/DatabaseClient.cpp
diff --git a/Source/modules/webdatabase/DatabaseClient.cpp b/Source/modules/webdatabase/DatabaseClient.cpp
index eb576ea96e46408ed7419c6f0dc717ded0fa577d..2428f8afee76232de226e4738615ec01dc70a15a 100644
--- a/Source/modules/webdatabase/DatabaseClient.cpp
+++ b/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
« no previous file with comments | « Source/modules/webdatabase/DatabaseClient.h ('k') | Source/modules/webdatabase/DatabaseContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698