Changeset 146975 in webkit

Timestamp:

Mar 27, 2013 2:29:05 AM (11 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: update Timeline.TimelineEvent definition to include DOM counters and native memory stats
​https://bugs.webkit.org/show_bug.cgi?id=113376

Reviewed by Vsevolod Vlasov.

Added missing fields to Timeline.TimelineEvent type definition in Inspector.json

• inspector/Inspector.json:
• inspector/InspectorTimelineAgent.cpp:

(WebCore::InspectorTimelineAgent::innerAddRecordToTimeline):
(WebCore::InspectorTimelineAgent::setDOMCounters):
Switched InspectorTimelineAgent to the new typed event builders.
(WebCore::InspectorTimelineAgent::setNativeHeapStatistics):

• inspector/InspectorTimelineAgent.h:

(InspectorTimelineAgent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.json (modified) (2 diffs)
• inspector/InspectorTimelineAgent.cpp (modified) (3 diffs)
• inspector/InspectorTimelineAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: update Timeline.TimelineEvent definition to include DOM counters and native memory stats
+        https://bugs.webkit.org/show_bug.cgi?id=113376
+
+        Reviewed by Vsevolod Vlasov.
+
+        Added missing fields to Timeline.TimelineEvent type definition in Inspector.json
+
+        * inspector/Inspector.json:
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::innerAddRecordToTimeline):
+        (WebCore::InspectorTimelineAgent::setDOMCounters):
+        Switched InspectorTimelineAgent to the new typed event builders.
+        (WebCore::InspectorTimelineAgent::setNativeHeapStatistics):
+        * inspector/InspectorTimelineAgent.h:
+        (InspectorTimelineAgent):
+
 2013-03-27  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -2599 +2599 @@
         "types": [
             {
+                "id": "DOMCounters",
+                "type": "object",
+                "properties": [
+                    { "name": "documents", "type": "integer" },
+                    { "name": "nodes", "type": "integer" },
+                    { "name": "jsEventListeners", "type": "integer" }
+                ],
+                "description": "Current values of DOM counters.",
+                "hidden": true
+            },
+            {
                 "id": "TimelineEvent",
                 "type": "object",
@@ -2605 +2616 @@
                     { "name": "thread", "type": "string", "optional": true, "description": "If present, identifies the thread that produced the event.", "hidden": true },
                     { "name": "data", "type": "object", "description": "Event data." },
-                    { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." }
+                    { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." },
+                    { "name": "counters", "$ref": "DOMCounters", "optional": true, "hidden": true, "description": "Current values of DOM counters." },
+                    { "name": "usedHeapSize", "type": "integer", "optional": true, "hidden": true, "description": "Current size of JS heap." },
+                    { "name": "nativeHeapStatistics", "type": "object", "optional": true, "hidden": true, "description": "Native heap statistics." }
                 ],
                 "description": "Timeline record contains information about the recorded activity."

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -541 +541 @@
 void InspectorTimelineAgent::innerAddRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, const String& type)
 {
-    RefPtr<InspectorObject> record(prpRecord);
+    RefPtr<TypeBuilder::Timeline::TimelineEvent> record = TypeBuilder::Timeline::TimelineEvent::runtimeCast(prpRecord);
     record->setString("type", type);
     if (type == TimelineRecordType::Program)
@@ -563 +563 @@
 }
 
-void InspectorTimelineAgent::setDOMCounters(InspectorObject* record)
-{
-    record->setNumber("usedHeapSize", getUsedHeapSize());
+void InspectorTimelineAgent::setDOMCounters(TypeBuilder::Timeline::TimelineEvent* record)
+{
+    record->setUsedHeapSize(getUsedHeapSize());
 
     if (m_state->getBoolean(TimelineAgentState::includeDomCounters)) {
-        RefPtr<InspectorObject> counters = InspectorObject::create();
-        counters->setNumber("nodes", (m_inspectorType == PageInspector) ? InspectorCounters::counterValue(InspectorCounters::NodeCounter) : 0);
-        counters->setNumber("documents", (m_inspectorType == PageInspector) ? InspectorCounters::counterValue(InspectorCounters::DocumentCounter) : 0);
-        counters->setNumber("jsEventListeners", ThreadLocalInspectorCounters::current().counterValue(ThreadLocalInspectorCounters::JSEventListenerCounter));
-        record->setObject("counters", counters.release());
+        int documentCount = 0;
+        int nodeCount = 0;
+        if (m_inspectorType == PageInspector) {
+            documentCount = InspectorCounters::counterValue(InspectorCounters::DocumentCounter);
+            nodeCount = InspectorCounters::counterValue(InspectorCounters::NodeCounter);
+        }
+        int listenerCount = ThreadLocalInspectorCounters::current().counterValue(ThreadLocalInspectorCounters::JSEventListenerCounter);
+        RefPtr<TypeBuilder::Timeline::DOMCounters> counters = TypeBuilder::Timeline::DOMCounters::create()
+            .setDocuments(documentCount)
+            .setNodes(nodeCount)
+            .setJsEventListeners(listenerCount);
+        record->setCounters(counters.release());
     }
 }
 
-void InspectorTimelineAgent::setNativeHeapStatistics(InspectorObject* record)
+void InspectorTimelineAgent::setNativeHeapStatistics(TypeBuilder::Timeline::TimelineEvent* record)
 {
     if (!m_memoryAgent)
@@ -591 +598 @@
     MemoryUsageSupport::processMemorySizesInBytes(&privateBytes, &sharedBytes);
     stats->setNumber("PrivateBytes", privateBytes);
-    record->setObject("nativeHeapStatistics", stats.release());
+    record->setNativeHeapStatistics(stats.release());
 }
 

trunk/Source/WebCore/inspector/InspectorTimelineAgent.h

@@ -215 +215 @@
     void pushCurrentRecord(PassRefPtr<InspectorObject>, const String& type, bool captureCallStack, Frame*, bool hasLowLevelDetails = false);
 
-    void setDOMCounters(InspectorObject* record);
-    void setNativeHeapStatistics(InspectorObject* record);
+    void setDOMCounters(TypeBuilder::Timeline::TimelineEvent* record);
+    void setNativeHeapStatistics(TypeBuilder::Timeline::TimelineEvent* record);
     void setFrameIdentifier(InspectorObject* record, Frame*);
     void pushGCEventRecords();