Changeset 113013 in webkit

Timestamp:

Apr 3, 2012 5:07:53 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: Database::Database::id field in the protocol should have type integer not string
​https://bugs.webkit.org/show_bug.cgi?id=83003

Reviewed by Pavel Feldman.

Changed DOM storage and database identifier type from int to String. This
is aligned with other domains and gives us more flexibility.

• bindings/js/JSInjectedScriptHostCustom.cpp:

(WebCore::JSInjectedScriptHost::databaseId):
(WebCore::JSInjectedScriptHost::storageId):

• bindings/v8/custom/V8InjectedScriptHostCustom.cpp:

(WebCore::V8InjectedScriptHost::databaseIdCallback):
(WebCore::V8InjectedScriptHost::storageIdCallback):

• inspector/InjectedScriptHost.cpp:

(WebCore::InjectedScriptHost::databaseIdImpl):
(WebCore::InjectedScriptHost::storageIdImpl):

• inspector/InjectedScriptHost.h:

(InjectedScriptHost):

• inspector/InjectedScriptHost.idl:
• inspector/Inspector.json:
• inspector/InspectorDOMStorageAgent.cpp:

(WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
(WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
(WebCore::InspectorDOMStorageAgent::storageId):
(WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):

• inspector/InspectorDOMStorageAgent.h:

(InspectorDOMStorageAgent):

• inspector/InspectorDOMStorageResource.cpp:

(WebCore::InspectorDOMStorageResource::InspectorDOMStorageResource):
(WebCore::InspectorDOMStorageResource::bind):

• inspector/InspectorDOMStorageResource.h:

(WebCore::InspectorDOMStorageResource::id):
(InspectorDOMStorageResource):

• inspector/InspectorDatabaseAgent.cpp:

(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
(WebCore::InspectorDatabaseAgent::executeSQL):
(WebCore::InspectorDatabaseAgent::databaseId):
(WebCore::InspectorDatabaseAgent::databaseForId):

• inspector/InspectorDatabaseAgent.h:

(InspectorDatabaseAgent):

• inspector/InspectorDatabaseResource.cpp:

(WebCore::InspectorDatabaseResource::InspectorDatabaseResource):
(WebCore::InspectorDatabaseResource::bind):

• inspector/InspectorDatabaseResource.h:

(WebCore::InspectorDatabaseResource::id):
(InspectorDatabaseResource):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSInjectedScriptHostCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp (modified) (2 diffs)
• inspector/InjectedScriptHost.cpp (modified) (1 diff)
• inspector/InjectedScriptHost.h (modified) (1 diff)
• inspector/InjectedScriptHost.idl (modified) (1 diff)
• inspector/Inspector.json (modified) (10 diffs)
• inspector/InspectorDOMStorageAgent.cpp (modified) (5 diffs)
• inspector/InspectorDOMStorageAgent.h (modified) (2 diffs)
• inspector/InspectorDOMStorageResource.cpp (modified) (2 diffs)
• inspector/InspectorDOMStorageResource.h (modified) (2 diffs)
• inspector/InspectorDatabaseAgent.cpp (modified) (5 diffs)
• inspector/InspectorDatabaseAgent.h (modified) (2 diffs)
• inspector/InspectorDatabaseResource.cpp (modified) (2 diffs)
• inspector/InspectorDatabaseResource.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-03  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: Database::Database::id field in the protocol should have type integer not string
+        https://bugs.webkit.org/show_bug.cgi?id=83003
+
+        Reviewed by Pavel Feldman.
+
+        Changed DOM storage and database identifier type from int to String. This
+        is aligned with other domains and gives us more flexibility.
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::databaseId):
+        (WebCore::JSInjectedScriptHost::storageId):
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::V8InjectedScriptHost::databaseIdCallback):
+        (WebCore::V8InjectedScriptHost::storageIdCallback):
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::databaseIdImpl):
+        (WebCore::InjectedScriptHost::storageIdImpl):
+        * inspector/InjectedScriptHost.h:
+        (InjectedScriptHost):
+        * inspector/InjectedScriptHost.idl:
+        * inspector/Inspector.json:
+        * inspector/InspectorDOMStorageAgent.cpp:
+        (WebCore::InspectorDOMStorageAgent::getDOMStorageEntries):
+        (WebCore::InspectorDOMStorageAgent::setDOMStorageItem):
+        (WebCore::InspectorDOMStorageAgent::removeDOMStorageItem):
+        (WebCore::InspectorDOMStorageAgent::storageId):
+        (WebCore::InspectorDOMStorageAgent::getDOMStorageResourceForId):
+        * inspector/InspectorDOMStorageAgent.h:
+        (InspectorDOMStorageAgent):
+        * inspector/InspectorDOMStorageResource.cpp:
+        (WebCore::InspectorDOMStorageResource::InspectorDOMStorageResource):
+        (WebCore::InspectorDOMStorageResource::bind):
+        * inspector/InspectorDOMStorageResource.h:
+        (WebCore::InspectorDOMStorageResource::id):
+        (InspectorDOMStorageResource):
+        * inspector/InspectorDatabaseAgent.cpp:
+        (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+        (WebCore::InspectorDatabaseAgent::executeSQL):
+        (WebCore::InspectorDatabaseAgent::databaseId):
+        (WebCore::InspectorDatabaseAgent::databaseForId):
+        * inspector/InspectorDatabaseAgent.h:
+        (InspectorDatabaseAgent):
+        * inspector/InspectorDatabaseResource.cpp:
+        (WebCore::InspectorDatabaseResource::InspectorDatabaseResource):
+        (WebCore::InspectorDatabaseResource::bind):
+        * inspector/InspectorDatabaseResource.h:
+        (WebCore::InspectorDatabaseResource::id):
+        (InspectorDatabaseResource):
+
 2012-04-03  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -257 +257 @@
     Database* database = toDatabase(exec->argument(0));
     if (database)
-        return jsNumber(impl()->databaseIdImpl(database));
+        return jsString(exec, impl()->databaseIdImpl(database));
 #endif
     return jsUndefined();
@@ -268 +268 @@
     Storage* storage = toStorage(exec->argument(0));
     if (storage)
-        return jsNumber(impl()->storageIdImpl(storage));
+        return jsString(exec, impl()->storageIdImpl(storage));
     return jsUndefined();
 }

trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

@@ -269 +269 @@
     Database* database = V8Database::toNative(v8::Handle<v8::Object>::Cast(args[0]));
     if (database)
-        return v8::Number::New(host->databaseIdImpl(database));
+        return v8StringOrUndefined(host->databaseIdImpl(database));
 #endif
     return v8::Undefined();
@@ -282 +282 @@
     Storage* storage = V8Storage::toNative(v8::Handle<v8::Object>::Cast(args[0]));
     if (storage)
-        return v8::Number::New(host->storageIdImpl(storage));
+        return v8StringOrUndefined(host->storageIdImpl(storage));
     return v8::Undefined();
 }

trunk/Source/WebCore/inspector/InjectedScriptHost.cpp

@@ -147 +147 @@
 
 #if ENABLE(SQL_DATABASE)
-int InjectedScriptHost::databaseIdImpl(Database* database)
+String InjectedScriptHost::databaseIdImpl(Database* database)
 {
     if (m_databaseAgent)
         return m_databaseAgent->databaseId(database);
-    return 0;
+    return String();
 }
 #endif
 
-int InjectedScriptHost::storageIdImpl(Storage* storage)
+String InjectedScriptHost::storageIdImpl(Storage* storage)
 {
     if (m_domStorageAgent)
         return m_domStorageAgent->storageId(storage);
-    return 0;
+    return String();
 }
 

trunk/Source/WebCore/inspector/InjectedScriptHost.h

@@ -99 +99 @@
     void copyText(const String& text);
 #if ENABLE(SQL_DATABASE)
-    int databaseIdImpl(Database*);
+    String databaseIdImpl(Database*);
 #endif
-    int storageIdImpl(Storage*);
+    String storageIdImpl(Storage*);
 #if ENABLE(WORKERS)
     long nextWorkerId();

trunk/Source/WebCore/inspector/InjectedScriptHost.idl

@@ -46 +46 @@
         [Custom] Array getEventListeners(in Node node);
 
-        [Custom] int databaseId(in DOMObject database);
-        [Custom] int storageId(in DOMObject storage);
+        [Custom] DOMString databaseId(in DOMObject database);
+        [Custom] DOMString storageId(in DOMObject storage);
 
 #if defined(ENABLE_WORKERS) && ENABLE_WORKERS

trunk/Source/WebCore/inspector/Inspector.json

@@ -883 +883 @@
         "types": [
             {
+                "id": "DatabaseId",
+                "type": "string",
+                "description": "Unique identifier of Database object.",
+                "hidden": true
+            },
+            {
                 "id": "Database",
                 "type": "object",
@@ -888 +894 @@
                 "hidden": true,
                 "properties": [
-                    { "name": "id", "type": "string", "description": "Database ID." },
+                    { "name": "id", "$ref": "DatabaseId", "description": "Database ID." },
                     { "name": "domain", "type": "string", "description": "Database domain." },
                     { "name": "name", "type": "string", "description": "Database name." },
@@ -912 +918 @@
                 "name": "getDatabaseTableNames",
                 "parameters": [
-                    { "name": "databaseId", "type": "integer" }
+                    { "name": "databaseId", "$ref": "DatabaseId" }
                 ],
                 "returns": [
@@ -921 +927 @@
                 "name": "executeSQL",
                 "parameters": [
-                    { "name": "databaseId", "type": "integer" },
+                    { "name": "databaseId", "$ref": "DatabaseId" },
                     { "name": "query", "type": "string" }
                 ],
@@ -1111 +1117 @@
         "types": [
             {
+                "id": "StorageId",
+                "type": "string",
+                "description": "Unique identifier of DOM storage entry.",
+                "hidden": true
+            },
+            {
                 "id": "Entry",
                 "type": "object",
@@ -1118 +1130 @@
                     { "name": "host", "type": "string", "description": "Domain name." },
                     { "name": "isLocalStorage", "type": "boolean", "description": "True for local storage." },
-                    { "name": "id", "type": "number", "description": "Entry id for further reference." }
+                    { "name": "id", "$ref": "StorageId", "description": "Entry id for further reference." }
                 ]
             }
@@ -1134 +1146 @@
                 "name": "getDOMStorageEntries",
                 "parameters": [
-                    { "name": "storageId", "type": "integer" }
+                    { "name": "storageId", "$ref": "StorageId" }
                 ],
                 "returns": [
@@ -1143 +1155 @@
                 "name": "setDOMStorageItem",
                 "parameters": [
-                    { "name": "storageId", "type": "integer" },
+                    { "name": "storageId", "$ref": "StorageId" },
                     { "name": "key", "type": "string" },
                     { "name": "value", "type": "string" }
@@ -1154 +1166 @@
                 "name": "removeDOMStorageItem",
                 "parameters": [
-                    { "name": "storageId", "type": "integer" },
+                    { "name": "storageId", "$ref": "StorageId" },
                     { "name": "key", "type": "string" }
                 ],
@@ -1172 +1184 @@
                 "name": "updateDOMStorage",
                 "parameters": [
-                    { "name": "storageId", "type": "integer" }
+                    { "name": "storageId",  "$ref": "StorageId" }
                 ]
             }

trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp

@@ -109 +109 @@
 }
 
-void InspectorDOMStorageAgent::getDOMStorageEntries(ErrorString*, int storageId, RefPtr<InspectorArray>& entries)
+void InspectorDOMStorageAgent::getDOMStorageEntries(ErrorString*, const String& storageId, RefPtr<InspectorArray>& entries)
 {
     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
@@ -130 +130 @@
 }
 
-void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString*, int storageId, const String& key, const String& value, bool* success)
+void InspectorDOMStorageAgent::setDOMStorageItem(ErrorString*, const String& storageId, const String& key, const String& value, bool* success)
 {
     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
@@ -140 +140 @@
 }
 
-void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString*, int storageId, const String& key, bool* success)
+void InspectorDOMStorageAgent::removeDOMStorageItem(ErrorString*, const String& storageId, const String& key, bool* success)
 {
     InspectorDOMStorageResource* storageResource = getDOMStorageResourceForId(storageId);
@@ -149 +149 @@
 }
 
-int InspectorDOMStorageAgent::storageId(Storage* storage)
+String InspectorDOMStorageAgent::storageId(Storage* storage)
 {
     ASSERT(storage);
@@ -160 +160 @@
             return it->first;
     }
-    return 0;
+    return String();
 }
 
-InspectorDOMStorageResource* InspectorDOMStorageAgent::getDOMStorageResourceForId(int storageId)
+InspectorDOMStorageResource* InspectorDOMStorageAgent::getDOMStorageResourceForId(const String& storageId)
 {
     DOMStorageResourcesMap::iterator it = m_resources.find(storageId);

trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h

@@ -65 +65 @@
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
-    virtual void getDOMStorageEntries(ErrorString*, int storageId, RefPtr<InspectorArray>& entries);
-    virtual void setDOMStorageItem(ErrorString*, int storageId, const String& key, const String& value, bool* success);
-    virtual void removeDOMStorageItem(ErrorString*, int storageId, const String& key, bool* success);
+    virtual void getDOMStorageEntries(ErrorString*, const String& storageId, RefPtr<InspectorArray>& entries);
+    virtual void setDOMStorageItem(ErrorString*, const String& storageId, const String& key, const String& value, bool* success);
+    virtual void removeDOMStorageItem(ErrorString*, const String& storageId, const String& key, bool* success);
 
     // Called from the injected script.
-    int storageId(Storage*);
+    String storageId(Storage*);
 
     // Called from InspectorInstrumentation
@@ -78 +78 @@
     InspectorDOMStorageAgent(InstrumentingAgents*, InspectorState*);
 
-    InspectorDOMStorageResource* getDOMStorageResourceForId(int storageId);
+    InspectorDOMStorageResource* getDOMStorageResourceForId(const String& storageId);
 
-    typedef HashMap<int, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
+    typedef HashMap<String, RefPtr<InspectorDOMStorageResource> > DOMStorageResourcesMap;
     DOMStorageResourcesMap m_resources;
     InspectorFrontend* m_frontend;

trunk/Source/WebCore/inspector/InspectorDOMStorageResource.cpp

@@ -58 +58 @@
     , m_frame(frame)
     , m_frontend(0)
-    , m_id(s_nextUnusedId++)
+    , m_id(String::number(s_nextUnusedId++))
     , m_reportingChangesToFrontend(false)
 {
@@ -76 +76 @@
     jsonObject->setString("host", m_frame->document()->securityOrigin()->host());
     jsonObject->setBoolean("isLocalStorage", m_isLocalStorage);
-    jsonObject->setNumber("id", m_id);
+    jsonObject->setString("id", m_id);
     m_frontend->addDOMStorage(jsonObject);
 }

trunk/Source/WebCore/inspector/InspectorDOMStorageResource.h

@@ -65 +65 @@
 
         bool isSameHostAndType(Frame*, bool isLocalStorage) const;
-        int id() const { return m_id; }
+        String id() const { return m_id; }
         StorageArea* storageArea() const { return m_storageArea.get(); }
         Frame* frame() const { return m_frame.get(); }
@@ -77 +77 @@
         RefPtr<Frame> m_frame;
         InspectorFrontend::DOMStorage* m_frontend;
-        int m_id;
+        String m_id;
         bool m_reportingChangesToFrontend;
 

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp

@@ -292 +292 @@
 }
 
-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, int databaseId, RefPtr<InspectorArray>& names)
+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<InspectorArray>& names)
 {
     if (!m_enabled) {
@@ -308 +308 @@
 }
 
-void InspectorDatabaseAgent::executeSQL(ErrorString* error, int databaseId, const String& query, bool* success, int* transactionId)
+void InspectorDatabaseAgent::executeSQL(ErrorString* error, const String& databaseId, const String& query, bool* success, int* transactionId)
 {
     if (!m_enabled) {
@@ -329 +329 @@
 }
 
-int InspectorDatabaseAgent::databaseId(Database* database)
+String InspectorDatabaseAgent::databaseId(Database* database)
 {
     for (DatabaseResourcesMap::iterator it = m_resources.begin(); it != m_resources.end(); ++it) {
@@ -335 +335 @@
             return it->first;
     }
-    return 0;
+    return String();
 }
 
@@ -347 +347 @@
 }
 
-Database* InspectorDatabaseAgent::databaseForId(int databaseId)
+Database* InspectorDatabaseAgent::databaseForId(const String& databaseId)
 {
     DatabaseResourcesMap::iterator it = m_resources.find(databaseId);

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h

@@ -67 +67 @@
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
-    virtual void getDatabaseTableNames(ErrorString*, int databaseId, RefPtr<InspectorArray>& names);
-    virtual void executeSQL(ErrorString*, int databaseId, const String& query, bool* success, int* transactionId);
+    virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<InspectorArray>& names);
+    virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, bool* success, int* transactionId);
 
     // Called from the injected script.
-    int databaseId(Database*);
+    String databaseId(Database*);
 
     void didOpenDatabase(PassRefPtr<Database>, const String& domain, const String& name, const String& version);
@@ -77 +77 @@
     explicit InspectorDatabaseAgent(InstrumentingAgents*, InspectorState*);
 
-    Database* databaseForId(int databaseId);
+    Database* databaseForId(const String& databaseId);
     InspectorDatabaseResource* findByFileName(const String& fileName);
 
-    typedef HashMap<int, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
+    typedef HashMap<String, RefPtr<InspectorDatabaseResource> > DatabaseResourcesMap;
     DatabaseResourcesMap m_resources;
     RefPtr<FrontendProvider> m_frontendProvider;

trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp

@@ -50 +50 @@
 InspectorDatabaseResource::InspectorDatabaseResource(PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
     : m_database(database)
-    , m_id(nextUnusedId++)
+    , m_id(String::number(nextUnusedId++))
     , m_domain(domain)
     , m_name(name)
@@ -60 +60 @@
 {
     RefPtr<InspectorObject> jsonObject = InspectorObject::create();
-    jsonObject->setNumber("id", m_id);
+    jsonObject->setString("id", m_id);
     jsonObject->setString("domain", m_domain);
     jsonObject->setString("name", m_name);

trunk/Source/WebCore/inspector/InspectorDatabaseResource.h

@@ -50 +50 @@
     Database* database() { return m_database.get(); }
     void setDatabase(PassRefPtr<Database> database) { m_database = database; }
-    int id() const { return m_id; }
+    String id() const { return m_id; }
 
 private:
@@ -56 +56 @@
 
     RefPtr<Database> m_database;
-    int m_id;
+    String m_id;
     String m_domain;
     String m_name;