DevTools: remove references to modules/webdatabase from core/inspector

Source/modules/webdatabase/DatabaseClient.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "DatabaseClient.h"
 
 #include "core/dom/Document.h"
+#include "core/inspector/InspectorController.h"
 #include "core/workers/WorkerGlobalScope.h"
+#include "modules/webdatabase/Database.h"
+#include "modules/webdatabase/InspectorDatabaseAgent.h"
 
 namespace WebCore {
 
 DatabaseClient* DatabaseClient::from(ExecutionContext* context)
 {
     if (context->isDocument()) {
         return static_cast<DatabaseClient*>(Supplement<Page>::from(toDocument(context)->page(), supplementName()));
     }
     ASSERT(context->isWorkerGlobalScope());
     return static_cast<DatabaseClient*>(Supplement<WorkerClients>::from(toWorkerGlobalScope(context)->clients(), supplementName()));
 }
 
 const char* DatabaseClient::supplementName()
 {
     return "DatabaseClient";
 }
 
+void DatabaseClient::didOpenDatabase(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
+{
+    m_inspectorAgent->didOpenDatabase(database, domain, name, version);
+}
+
 void provideDatabaseClientTo(Page* page, PassOwnPtr<DatabaseClient> client)
 {
+    DatabaseClient* clientPtr = client.get();
     page->provideSupplement(DatabaseClient::supplementName(), client);
+    OwnPtr<InspectorDatabaseAgent> inspectorAgent = InspectorDatabaseAgent::create();
+    clientPtr->setInspectorDatabaseAgent(inspectorAgent.get());
+    page->inspectorController().registerModuleAgent(inspectorAgent.release());

[pfeldman, 2014/02/05 13:21:44]

It sounds like DatabaseClientImpl for worker and for page could be different
entities. And the one for page could be parametrized w/ page instance. You would
then instantiate agent in place.

[Vladislav Kaznacheev, 2014/02/06 12:38:37]

I would really like to avoid involving the Web layer into this. I made a simple
change that should look less hairy, please take a look.

On 2014/02/05 13:21:44, pfeldman wrote:

 }
 
 void provideDatabaseClientToWorker(WorkerClients* workerClients, PassOwnPtr<DatabaseClient> client)
 {
     workerClients->provideSupplement(DatabaseClient::supplementName(), client);
 }
 
 } // namespace WebCore