Changeset 116768 in webkit

Timestamp:

May 11, 2012 8:05:42 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: add Profiler.getHeapObjectId command
​https://bugs.webkit.org/show_bug.cgi?id=86211

Reviewed by Pavel Feldman.

Added Profiler.getHeapObjectId command to the protocol which allows to convert remote
object id to heap snapshot object id.

• bindings/js/ScriptProfiler.cpp:

(WebCore::ScriptProfiler::getHeapObjectId):
(WebCore):

• bindings/js/ScriptProfiler.h:

(WebCore):
(ScriptProfiler):

• bindings/v8/ScriptProfiler.cpp:

(WebCore::ScriptProfiler::getHeapObjectId):
(WebCore):

• bindings/v8/ScriptProfiler.h:

(WebCore):
(ScriptProfiler):

• inspector/InjectedScript.cpp:

(WebCore::InjectedScript::findObjectById):
(WebCore):

• inspector/InjectedScript.h:

(InjectedScript):

• inspector/InjectedScriptSource.js:

(.):

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

(WebCore::InspectorProfilerAgent::getHeapObjectId):
(WebCore):

• inspector/InspectorProfilerAgent.h:

(InspectorProfilerAgent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptProfiler.cpp (modified) (1 diff)
• bindings/js/ScriptProfiler.h (modified) (2 diffs)
• bindings/v8/ScriptProfiler.cpp (modified) (1 diff)
• bindings/v8/ScriptProfiler.h (modified) (2 diffs)
• inspector/InjectedScript.cpp (modified) (1 diff)
• inspector/InjectedScript.h (modified) (1 diff)
• inspector/InjectedScriptSource.js (modified) (1 diff)
• inspector/Inspector.json (modified) (2 diffs)
• inspector/InspectorProfilerAgent.cpp (modified) (2 diffs)
• inspector/InspectorProfilerAgent.h (modified) (1 diff)
• inspector/front-end/HeapSnapshotGridNodes.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: add Profiler.getHeapObjectId command
+        https://bugs.webkit.org/show_bug.cgi?id=86211
+
+        Reviewed by Pavel Feldman.
+
+        Added Profiler.getHeapObjectId command to the protocol which allows to convert remote
+        object id to heap snapshot object id.
+
+        * bindings/js/ScriptProfiler.cpp:
+        (WebCore::ScriptProfiler::getHeapObjectId):
+        (WebCore):
+        * bindings/js/ScriptProfiler.h:
+        (WebCore):
+        (ScriptProfiler):
+        * bindings/v8/ScriptProfiler.cpp:
+        (WebCore::ScriptProfiler::getHeapObjectId):
+        (WebCore):
+        * bindings/v8/ScriptProfiler.h:
+        (WebCore):
+        (ScriptProfiler):
+        * inspector/InjectedScript.cpp:
+        (WebCore::InjectedScript::findObjectById):
+        (WebCore):
+        * inspector/InjectedScript.h:
+        (InjectedScript):
+        * inspector/InjectedScriptSource.js:
+        (.):
+        * inspector/Inspector.json:
+        * inspector/InspectorProfilerAgent.cpp:
+        (WebCore::InspectorProfilerAgent::getHeapObjectId):
+        (WebCore):
+        * inspector/InspectorProfilerAgent.h:
+        (InspectorProfilerAgent):
+
 2012-05-11  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

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

@@ -52 +52 @@
 }
 
+unsigned ScriptProfiler::getHeapObjectId(ScriptValue)
+{
+    return 0;
+}
+
 void ScriptProfiler::start(ScriptState* state, const String& title)
 {

trunk/Source/WebCore/bindings/js/ScriptProfiler.h

@@ -40 +40 @@
 class Page;
 class ScriptObject;
+class ScriptValue;
 class WorkerContext;
 
@@ -56 +57 @@
     static void collectGarbage();
     static ScriptObject objectByHeapObjectId(unsigned id);
+    static unsigned getHeapObjectId(ScriptValue);
     static void start(ScriptState* state, const String& title);
     static void startForPage(Page*, const String& title);

trunk/Source/WebCore/bindings/v8/ScriptProfiler.cpp

@@ -122 +122 @@
 }
 
+unsigned ScriptProfiler::getHeapObjectId(ScriptValue value)
+{
+    v8::SnapshotObjectId id = v8::HeapProfiler::GetSnapshotObjectId(value.v8Value());
+    return id;
+}
+
 namespace {
 

trunk/Source/WebCore/bindings/v8/ScriptProfiler.h

@@ -44 +44 @@
 class Page;
 class ScriptObject;
+class ScriptValue;
 class WorkerContext;
 
@@ -60 +61 @@
     static void collectGarbage();
     static ScriptObject objectByHeapObjectId(unsigned id);
+    static unsigned getHeapObjectId(ScriptValue);
     static void start(ScriptState* state, const String& title);
     static void startForPage(Page*, const String& title);

trunk/Source/WebCore/inspector/InjectedScript.cpp

@@ -191 +191 @@
 }
 
+ScriptValue InjectedScript::findObjectById(const String& objectId) const
+{
+    ASSERT(!hasNoValue());
+    ScriptFunctionCall function(m_injectedScriptObject, "findObjectById");
+    function.appendArgument(objectId);
+
+    bool hadException = false;
+    ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
+    ASSERT(!hadException);
+    return resultValue;
+}
+
 void InjectedScript::inspectNode(Node* node)
 {

trunk/Source/WebCore/inspector/InjectedScript.h

@@ -94 +94 @@
     PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapNode(Node*, const String& groupName);
     PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapSerializedObject(SerializedScriptValue*, const String& groupName) const;
+    ScriptValue findObjectById(const String& objectId) const;
+
     void inspectNode(Node*);
     void releaseObjectGroup(const String&);

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -385 +385 @@
     },
 
+    findObjectById: function(objectId)
+    {
+        var parsedObjectId = this._parseObjectId(objectId);
+        return this._objectForId(parsedObjectId);
+    },
+
     nodeForObjectId: function(objectId)
     {
-        var parsedObjectId = this._parseObjectId(objectId);
-        var object = this._objectForId(parsedObjectId);
+        var object = this.findObjectById(objectId);
         if (!object || this._subtype(object) !== "node")
             return null;

trunk/Source/WebCore/inspector/Inspector.json

@@ -2597 +2597 @@
                     { "name": "bottomUpHead", "type": "object", "optional": true }
                 ]
+            },
+            {
+                "id": "HeapSnapshotObjectId",
+                "type": "string",
+                "description": "Heap snashot object id."
             }
         ],
@@ -2665 +2670 @@
                 "name": "getObjectByHeapObjectId",
                 "parameters": [
-                    { "name": "objectId", "type": "integer" },
+                    { "name": "objectId", "$ref": "HeapSnapshotObjectId" },
                     { "name": "objectGroup", "type": "string", "optional": true, "description": "Symbolic group name that can be used to release multiple objects." }
                 ],
                 "returns": [
                     { "name": "result", "$ref": "Runtime.RemoteObject", "description": "Evaluation result." }
+                ]
+            },
+            {
+                "name": "getHeapObjectId",
+                "parameters": [
+                    { "name": "objectId", "$ref": "Runtime.RemoteObjectId", "description": "Identifier of the object to get heap object id for." }
+                ],
+                "returns": [
+                    { "name": "heapSnapshotObjectId", "$ref": "HeapSnapshotObjectId", "description": "Id of the heap snapshot object corresponding to the passed remote object id." }
                 ]
             }

trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp

@@ -429 +429 @@
 }
 
-void InspectorProfilerAgent::getObjectByHeapObjectId(ErrorString* error, int id, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result)
-{
+void InspectorProfilerAgent::getObjectByHeapObjectId(ErrorString* error, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result)
+{
+    bool ok;
+    unsigned id = heapSnapshotObjectId.toUInt(&ok);
+    if (!ok) {
+        *error = "Invalid heap snapshot object id";
+        return;
+    }
     ScriptObject heapObject = ScriptProfiler::objectByHeapObjectId(id);
     if (heapObject.hasNoValue()) {
@@ -446 +452 @@
 }
 
+void InspectorProfilerAgent::getHeapObjectId(ErrorString* errorString, const String& objectId, String* heapSnapshotObjectId)
+{
+    InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
+    if (injectedScript.hasNoValue()) {
+        *errorString = "Inspected context has gone";
+        return;
+    }
+    ScriptValue value = injectedScript.findObjectById(objectId);
+    if (value.hasNoValue() || value.isUndefined()) {
+        *errorString = "Object with given id not found";
+        return;
+    }
+    unsigned id = ScriptProfiler::getHeapObjectId(value);
+    *heapSnapshotObjectId = String::number(id);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorProfilerAgent.h

@@ -97 +97 @@
     void toggleRecordButton(bool isProfiling);
 
-    virtual void getObjectByHeapObjectId(ErrorString*, int id, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result);
+    virtual void getObjectByHeapObjectId(ErrorString*, const String& heapSnapshotObjectId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& result);
+    virtual void getHeapObjectId(ErrorString*, const String& objectId, String* heapSnapshotObjectId);
 
 protected:

trunk/Source/WebCore/inspector/front-end/HeapSnapshotGridNodes.js

@@ -340 +340 @@
                     callback(WebInspector.RemoteObject.fromPrimitiveValue(WebInspector.UIString("Not available")));
             }
-            ProfilerAgent.getObjectByHeapObjectId(this.snapshotNodeId, objectGroupName, formatResult);
+            ProfilerAgent.getObjectByHeapObjectId(String(this.snapshotNodeId), objectGroupName, formatResult);
         }
     },