Changeset 244275 in webkit

Timestamp:

Apr 15, 2019, 11:47:38 AM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Heap: logging an object from a snapshot shouldn't use the "special" style if the object is reachable
​https://bugs.webkit.org/show_bug.cgi?id=196889
<rdar://problem/49870693>

Reviewed by Joseph Pecoraro.

• UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:

(WI.HeapSnapshotInstanceDataGridNode.logHeapSnapshotNode):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/HeapSnapshotInstanceDataGridNode.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Heap: logging an object from a snapshot shouldn't use the "special" style if the object is reachable
+        https://bugs.webkit.org/show_bug.cgi?id=196889
+        <rdar://problem/49870693>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/HeapSnapshotInstanceDataGridNode.js:
+        (WI.HeapSnapshotInstanceDataGridNode.logHeapSnapshotNode):
+
 2019-04-15  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/HeapSnapshotInstanceDataGridNode.js

@@ -53 +53 @@
     static logHeapSnapshotNode(node)
     {
-        let heapObjectIdentifier = node.id;
-        let shouldRevealConsole = true;
-        let text = WI.UIString("Heap Snapshot Object (%s)").format("@" + heapObjectIdentifier);
-
         node.shortestGCRootPath((gcRootPath) => {
+            let text = WI.UIString("Heap Snapshot Object (%s)").format("@" + node.id);
+            let addSpecialUserLogClass = !gcRootPath.length;
+
             if (gcRootPath.length) {
                 gcRootPath = gcRootPath.slice().reverse();
@@ -74 +73 @@
                 }
 
-                if (!heapSnapshotRootPath.isFullPathImpossible())
+                if (heapSnapshotRootPath.isFullPathImpossible())
+                    addSpecialUserLogClass = true;
+                else
                     text = heapSnapshotRootPath.fullPath;
             }
 
+            const shouldRevealConsole = true;
+
             if (node.className === "string") {
-                HeapAgent.getPreview(heapObjectIdentifier, function(error, string, functionDetails, objectPreviewPayload) {
+                HeapAgent.getPreview(node.id, function(error, string, functionDetails, objectPreviewPayload) {
                     let remoteObject = error ? WI.RemoteObject.fromPrimitiveValue(undefined) : WI.RemoteObject.fromPrimitiveValue(string);
-                    WI.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, shouldRevealConsole);
+                    WI.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, addSpecialUserLogClass, shouldRevealConsole);
                 });
             } else {
-                HeapAgent.getRemoteObject(heapObjectIdentifier, WI.RuntimeManager.ConsoleObjectGroup, function(error, remoteObjectPayload) {
+                HeapAgent.getRemoteObject(node.id, WI.RuntimeManager.ConsoleObjectGroup, function(error, remoteObjectPayload) {
                     let remoteObject = error ? WI.RemoteObject.fromPrimitiveValue(undefined) : WI.RemoteObject.fromPayload(remoteObjectPayload, WI.assumingMainTarget());
-                    WI.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, shouldRevealConsole);
+                    WI.consoleLogViewController.appendImmediateExecutionWithResult(text, remoteObject, addSpecialUserLogClass, shouldRevealConsole);
                 });
             }