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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "DatabaseClient.h" 32 #include "modules/webdatabase/DatabaseClient.h"
33 33
34 #include "core/dom/Document.h" 34 #include "core/dom/Document.h"
35 #include "core/inspector/InspectorController.h" 35 #include "core/inspector/InspectorController.h"
36 #include "core/page/Page.h" 36 #include "core/page/Page.h"
37 #include "core/workers/WorkerGlobalScope.h"
38 #include "modules/webdatabase/Database.h" 37 #include "modules/webdatabase/Database.h"
39 #include "modules/webdatabase/InspectorDatabaseAgent.h" 38 #include "modules/webdatabase/InspectorDatabaseAgent.h"
40 39
41 namespace blink { 40 namespace blink {
42 41
43 DatabaseClient::DatabaseClient() 42 DatabaseClient::DatabaseClient()
44 : m_inspectorAgent(0) 43 : m_inspectorAgent(0)
45 { } 44 { }
46 45
47 DatabaseClient* DatabaseClient::from(ExecutionContext* context) 46 DatabaseClient* DatabaseClient::from(ExecutionContext* context)
48 { 47 {
49 if (context->isDocument()) { 48 return static_cast<DatabaseClient*>(WillBeHeapSupplement<Page>::from(toDocum ent(context)->page(), supplementName()));
50 return static_cast<DatabaseClient*>(WillBeHeapSupplement<Page>::from(toD ocument(context)->page(), supplementName()));
51 }
52 ASSERT(context->isWorkerGlobalScope());
53 return static_cast<DatabaseClient*>(WillBeHeapSupplement<WorkerClients>::fro m(toWorkerGlobalScope(context)->clients(), supplementName()));
54 } 49 }
55 50
56 const char* DatabaseClient::supplementName() 51 const char* DatabaseClient::supplementName()
57 { 52 {
58 return "DatabaseClient"; 53 return "DatabaseClient";
59 } 54 }
60 55
61 void DatabaseClient::didOpenDatabase(PassRefPtrWillBeRawPtr<Database> database, const String& domain, const String& name, const String& version) 56 void DatabaseClient::didOpenDatabase(PassRefPtrWillBeRawPtr<Database> database, const String& domain, const String& name, const String& version)
62 { 57 {
63 if (m_inspectorAgent) 58 if (m_inspectorAgent)
64 m_inspectorAgent->didOpenDatabase(database, domain, name, version); 59 m_inspectorAgent->didOpenDatabase(database, domain, name, version);
65 } 60 }
66 61
67 void DatabaseClient::createInspectorAgentFor(Page* page) 62 void DatabaseClient::createInspectorAgentFor(Page* page)
68 { 63 {
69 ASSERT(!m_inspectorAgent); 64 ASSERT(!m_inspectorAgent);
70 OwnPtrWillBeRawPtr<InspectorDatabaseAgent> inspectorAgent = InspectorDatabas eAgent::create(); 65 OwnPtrWillBeRawPtr<InspectorDatabaseAgent> inspectorAgent = InspectorDatabas eAgent::create();
71 m_inspectorAgent = inspectorAgent.get(); 66 m_inspectorAgent = inspectorAgent.get();
72 page->inspectorController().registerModuleAgent(inspectorAgent.release()); 67 page->inspectorController().registerModuleAgent(inspectorAgent.release());
73 } 68 }
74 69
75 void provideDatabaseClientTo(Page& page, PassOwnPtrWillBeRawPtr<DatabaseClient> client) 70 void provideDatabaseClientTo(Page& page, PassOwnPtrWillBeRawPtr<DatabaseClient> client)
76 { 71 {
77 DatabaseClient* clientPtr = client.get(); 72 DatabaseClient* clientPtr = client.get();
78 page.provideSupplement(DatabaseClient::supplementName(), client); 73 page.provideSupplement(DatabaseClient::supplementName(), client);
79 clientPtr->createInspectorAgentFor(&page); 74 clientPtr->createInspectorAgentFor(&page);
80 } 75 }
81 76
82 void provideDatabaseClientToWorker(WorkerClients* workerClients, PassOwnPtrWillB eRawPtr<DatabaseClient> client)
83 {
84 workerClients->provideSupplement(DatabaseClient::supplementName(), client);
85 }
86
87 } // namespace blink 77 } // namespace blink
OLDNEW
« 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