Changeset 113157 in webkit

Timestamp:

Apr 4, 2012 2:36:28 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: CodeGeneratorInspector.py: switch Inspector, Memory and Database domains to typed API
​https://bugs.webkit.org/show_bug.cgi?id=82958

Patch by Peter Rybin <​peter.rybin@gmail.com> on 2012-04-02
Reviewed by Yury Semikhatsky.

Client code is switched to typed API (all InspectorObject and InspectorArray types are replaced with
generated types from TypeBuilder according to Inspector.json).

Missing array of InspectorValues specialization is added.

• inspector/CodeGeneratorInspector.py:
• inspector/InjectedScriptHost.cpp:

(WebCore::InjectedScriptHost::inspectImpl):

• inspector/InspectorAgent.cpp:

(WebCore::InspectorAgent::inspect):

• inspector/InspectorAgent.h:

(InspectorAgent):

• inspector/InspectorDatabaseAgent.cpp:

(WebCore):
(WebCore::InspectorDatabaseAgent::getDatabaseTableNames):

• inspector/InspectorDatabaseAgent.h:

(InspectorDatabaseAgent):

• inspector/InspectorDatabaseResource.cpp:

(WebCore::InspectorDatabaseResource::bind):

• inspector/InspectorMemoryAgent.cpp:

(WebCore::InspectorMemoryAgent::getDOMNodeCount):

• inspector/InspectorMemoryAgent.h:

(InspectorMemoryAgent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/CodeGeneratorInspector.py (modified) (2 diffs)
• inspector/InjectedScriptHost.cpp (modified) (1 diff)
• inspector/InspectorAgent.cpp (modified) (1 diff)
• inspector/InspectorAgent.h (modified) (2 diffs)
• inspector/InspectorDatabaseAgent.cpp (modified) (4 diffs)
• inspector/InspectorDatabaseAgent.h (modified) (1 diff)
• inspector/InspectorDatabaseResource.cpp (modified) (1 diff)
• inspector/InspectorMemoryAgent.cpp (modified) (4 diffs)
• inspector/InspectorMemoryAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-02  Peter Rybin  <peter.rybin@gmail.com>
+
+        Web Inspector: CodeGeneratorInspector.py: switch Inspector, Memory and Database domains to typed API
+        https://bugs.webkit.org/show_bug.cgi?id=82958
+
+        Reviewed by Yury Semikhatsky.
+
+        Client code is switched to typed API (all InspectorObject and InspectorArray types are replaced with
+        generated types from TypeBuilder according to Inspector.json).
+
+        Missing array of InspectorValues specialization is added.
+
+        * inspector/CodeGeneratorInspector.py:
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::inspectImpl):
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::inspect):
+        * inspector/InspectorAgent.h:
+        (InspectorAgent):
+        * inspector/InspectorDatabaseAgent.cpp:
+        (WebCore):
+        (WebCore::InspectorDatabaseAgent::getDatabaseTableNames):
+        * inspector/InspectorDatabaseAgent.h:
+        (InspectorDatabaseAgent):
+        * inspector/InspectorDatabaseResource.cpp:
+        (WebCore::InspectorDatabaseResource::bind):
+        * inspector/InspectorMemoryAgent.cpp:
+        (WebCore::InspectorMemoryAgent::getDOMNodeCount):
+        * inspector/InspectorMemoryAgent.h:
+        (InspectorMemoryAgent):
+
 2012-04-04  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/inspector/CodeGeneratorInspector.py

@@ -61 +61 @@
 
 STRICT_ENABLED_DOMAINS = ["Console", "DOMDebugger",
-                          "CSS", "Debugger", "DOM", "Network", "Page", "Runtime"]
+                          "CSS", "Debugger", "DOM", "Network", "Page", "Runtime",
+                          "Inspector", "Memory", "Database"]
 
 
@@ -2278 +2279 @@
 };
 
-
-
 template<>
-struct ArrayItemHelper<InspectorObject> {
+struct ArrayItemHelper<InspectorValue> {
     struct Traits {
-        static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorObject> value)
+        static void pushRefPtr(InspectorArray* array, PassRefPtr<InspectorValue> value)
         {
-            array->pushObject(value);
+            array->pushValue(value);
         }
     };

trunk/Source/WebCore/inspector/InjectedScriptHost.cpp

@@ -99 +99 @@
 void InjectedScriptHost::inspectImpl(PassRefPtr<InspectorValue> object, PassRefPtr<InspectorValue> hints)
 {
-    if (m_inspectorAgent)
-        m_inspectorAgent->inspect(object->asObject(), hints->asObject());
+    if (m_inspectorAgent) {
+        RefPtr<TypeBuilder::Runtime::RemoteObject> remoteObject = TypeBuilder::Runtime::RemoteObject::runtimeCast(object);
+        m_inspectorAgent->inspect(remoteObject, hints->asObject());
+    }
 }
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -203 +203 @@
 }
 
-void InspectorAgent::inspect(PassRefPtr<InspectorObject> objectToInspect, PassRefPtr<InspectorObject> hints)
+void InspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints)
 {
     if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled) && m_frontend) {

trunk/Source/WebCore/inspector/InspectorAgent.h

@@ -95 +95 @@
     void setInjectedScriptForOrigin(const String& origin, const String& source);
 
-    void inspect(PassRefPtr<InspectorObject> objectToInspect, PassRefPtr<InspectorObject> hints);
+    void inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<InspectorObject> hints);
 
 private:
@@ -113 +113 @@
 
     Vector<pair<long, String> > m_pendingEvaluateTestCommands;
-    pair<RefPtr<InspectorObject>, RefPtr<InspectorObject> > m_pendingInspectData;
+    pair<RefPtr<TypeBuilder::Runtime::RemoteObject>, RefPtr<InspectorObject> > m_pendingInspectData;
     typedef HashMap<String, String> InjectedScriptForOriginMap;
     InjectedScriptForOriginMap m_injectedScriptForOrigin;

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp

@@ -104 +104 @@
         SQLResultSetRowList* rowList = resultSet->rows();
 
-        RefPtr<InspectorArray> columnNames = InspectorArray::create();
+        RefPtr<TypeBuilder::Array<String> > columnNames = TypeBuilder::Array<String>::create();
         const Vector<String>& columns = rowList->columnNames();
         for (size_t i = 0; i < columns.size(); ++i)
-            columnNames->pushString(columns[i]);
-
-        RefPtr<InspectorArray> values = InspectorArray::create();
+            columnNames->addItem(columns[i]);
+
+        RefPtr<TypeBuilder::Array<InspectorValue> > values = TypeBuilder::Array<InspectorValue>::create();
         const Vector<SQLValue>& data = rowList->values();
         for (size_t i = 0; i < data.size(); ++i) {
             const SQLValue& value = rowList->values()[i];
             switch (value.type()) {
-                case SQLValue::StringValue: values->pushString(value.string()); break;
-                case SQLValue::NumberValue: values->pushNumber(value.number()); break;
-                case SQLValue::NullValue: values->pushValue(InspectorValue::null()); break;
+            case SQLValue::StringValue: values->addItem(InspectorString::create(value.string())); break;
+            case SQLValue::NumberValue: values->addItem(InspectorBasicValue::create(value.number())); break;
+            case SQLValue::NullValue: values->addItem(InspectorValue::null()); break;
             }
         }
@@ -292 +292 @@
 }
 
-void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<InspectorArray>& names)
+void InspectorDatabaseAgent::getDatabaseTableNames(ErrorString* error, const String& databaseId, RefPtr<TypeBuilder::Array<String> >& names)
 {
     if (!m_enabled) {
@@ -298 +298 @@
         return;
     }
+
+    names = TypeBuilder::Array<String>::create();
 
     Database* database = databaseForId(databaseId);
@@ -304 +306 @@
         unsigned length = tableNames.size();
         for (unsigned i = 0; i < length; ++i)
-            names->pushString(tableNames[i]);
+            names->addItem(tableNames[i]);
     }
 }

trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h

@@ -67 +67 @@
     virtual void enable(ErrorString*);
     virtual void disable(ErrorString*);
-    virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<InspectorArray>& names);
+    virtual void getDatabaseTableNames(ErrorString*, const String& databaseId, RefPtr<TypeBuilder::Array<String> >& names);
     virtual void executeSQL(ErrorString*, const String& databaseId, const String& query, bool* success, int* transactionId);
 

trunk/Source/WebCore/inspector/InspectorDatabaseResource.cpp

@@ -59 +59 @@
 void InspectorDatabaseResource::bind(InspectorFrontend::Database* frontend)
 {
-    RefPtr<InspectorObject> jsonObject = InspectorObject::create();
-    jsonObject->setString("id", m_id);
-    jsonObject->setString("domain", m_domain);
-    jsonObject->setString("name", m_name);
-    jsonObject->setString("version", m_version);
+    RefPtr<TypeBuilder::Database::Database> jsonObject = TypeBuilder::Database::Database::create()
+        .setId(m_id)
+        .setDomain(m_domain)
+        .setName(m_name)
+        .setVersion(m_version);
     frontend->addDatabase(jsonObject);
 }

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -199 +199 @@
     CounterVisitor(Page* page)
         : m_page(page)
-        , m_domGroups(InspectorArray::create())
+        , m_domGroups(TypeBuilder::Array<TypeBuilder::Memory::DOMGroup>::create())
         , m_jsExternalStringSize(0)
         , m_sharedStringSize(0) { }
 
-    InspectorArray* domGroups() { return m_domGroups.get(); }
-
-    PassRefPtr<InspectorObject> strings()
+    TypeBuilder::Array<TypeBuilder::Memory::DOMGroup>* domGroups() { return m_domGroups.get(); }
+
+    PassRefPtr<StringStatistics> strings()
     {
         RefPtr<StringStatistics> stringStatistics = StringStatistics::create()
@@ -237 +237 @@
             domGroup->setDocumentURI(static_cast<Document*>(rootNode)->documentURI());
 
-        m_domGroups->pushObject(domGroup);
+        m_domGroups->addItem(domGroup);
     }
 
@@ -279 +279 @@
     HashSet<Node*> m_roots;
     Page* m_page;
-    RefPtr<InspectorArray> m_domGroups;
+    RefPtr<TypeBuilder::Array<TypeBuilder::Memory::DOMGroup> > m_domGroups;
     CharacterDataStatistics m_characterDataStatistics;
     int m_jsExternalStringSize;
@@ -291 +291 @@
 }
 
-void InspectorMemoryAgent::getDOMNodeCount(ErrorString*, RefPtr<InspectorArray>& domGroups, RefPtr<InspectorObject>& strings)
+void InspectorMemoryAgent::getDOMNodeCount(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Memory::DOMGroup> >& domGroups, RefPtr<TypeBuilder::Memory::StringStatistics>& strings)
 {
     CounterVisitor counterVisitor(m_page);

trunk/Source/WebCore/inspector/InspectorMemoryAgent.h

@@ -58 +58 @@
     }
 
-    void getDOMNodeCount(ErrorString*, RefPtr<InspectorArray>& domGroups, RefPtr<InspectorObject>& strings);
+    void getDOMNodeCount(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Memory::DOMGroup> >& domGroups, RefPtr<TypeBuilder::Memory::StringStatistics>& strings);
 
     ~InspectorMemoryAgent();