1 files changed, 19 insertions, 15 deletions
diff --git a/WebCore/inspector/InspectorDatabaseResource.cpp b/WebCore/inspector/InspectorDatabaseResource.cpp
index cec0e28..036148f 100644
--- a/WebCore/inspector/InspectorDatabaseResource.cpp
+++ b/WebCore/inspector/InspectorDatabaseResource.cpp
@@ -33,18 +33,21 @@
 
 #if ENABLE(DATABASE) && ENABLE(INSPECTOR)
 #include "Database.h"
-#include "Document.h"
-#include "Frame.h"
-#include "InspectorFrontend.h"
-#include "ScriptObject.h"
+#include "InspectorValues.h"
+#include "RemoteInspectorFrontend.h"
 
 namespace WebCore {
 
-int InspectorDatabaseResource::s_nextUnusedId = 1;
+static int nextUnusedId = 1;
 
-InspectorDatabaseResource::InspectorDatabaseResource(Database* database, const String& domain, const String& name, const String& version)
+PassRefPtr<InspectorDatabaseResource> InspectorDatabaseResource::create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
+{
+    return adoptRef(new InspectorDatabaseResource(database, domain, name, version));
+}
+
+InspectorDatabaseResource::InspectorDatabaseResource(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
     : m_database(database)
-    , m_id(s_nextUnusedId++)
+    , m_id(nextUnusedId++)
     , m_domain(domain)
     , m_name(name)
     , m_version(version)
@@ -52,18 +55,19 @@ InspectorDatabaseResource::InspectorDatabaseResource(Database* database, const S
 {
 }
 
-void InspectorDatabaseResource::bind(InspectorFrontend* frontend)
+void InspectorDatabaseResource::bind(RemoteInspectorFrontend* frontend)
 {
     if (m_scriptObjectCreated)
         return;
 
-    ScriptObject jsonObject = frontend->newScriptObject();
-    jsonObject.set("id", m_id);
-    jsonObject.set("domain", m_domain);
-    jsonObject.set("name", m_name);
-    jsonObject.set("version", m_version);
-    if (frontend->addDatabase(jsonObject))
-        m_scriptObjectCreated = true;
+    RefPtr<InspectorObject> jsonObject = InspectorObject::create();
+    jsonObject->setNumber("id", m_id);
+    jsonObject->setString("domain", m_domain);
+    jsonObject->setString("name", m_name);
+    jsonObject->setString("version", m_version);
+
+    frontend->addDatabase(jsonObject);
+    m_scriptObjectCreated = true;
 }
 
 void InspectorDatabaseResource::unbind()