Changeset 116959 in webkit

Timestamp:

May 14, 2012 10:12:11 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: do not update $0-$4 console variables for the objects from loaded from file heap snapshot.
​https://bugs.webkit.org/show_bug.cgi?id=86371

When the user selects an object in HeapSnapshot we are updating $0 variable in console API.
But if the snapshot was loaded from file then we can't map object id for the selected obect
from the snapshot to the live objects in the inspected page.

Reviewed by Yury Semikhatsky.

• inspector/front-end/HeapSnapshotView.js:

(WebInspector.HeapSnapshotView.prototype._inspectedObjectChanged):
(WebInspector.HeapSnapshotView.prototype._updateFilterOptions):
(WebInspector.HeapProfileHeader):
(WebInspector.HeapProfileHeader.prototype.canSaveToFile):
(WebInspector.HeapProfileHeader.prototype.saveToFile):

• inspector/front-end/ProfilesPanel.js:

(WebInspector.ProfileHeader):
(WebInspector.ProfileHeader.prototype.loadFromFile):
(WebInspector.ProfileHeader.prototype.fromFile):
(WebInspector.ProfilesPanel.prototype._loadFromFile):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/HeapSnapshotView.js (modified) (7 diffs)
• inspector/front-end/ProfilesPanel.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-14  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: do not update $0-$4 console variables for the objects from loaded from file heap snapshot.
+        https://bugs.webkit.org/show_bug.cgi?id=86371
+
+        When the user selects an object in HeapSnapshot we are updating $0 variable in console API.
+        But if the snapshot was loaded from file then we can't map object id for the selected obect
+        from the snapshot to the live objects in the inspected page.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/HeapSnapshotView.js:
+        (WebInspector.HeapSnapshotView.prototype._inspectedObjectChanged):
+        (WebInspector.HeapSnapshotView.prototype._updateFilterOptions):
+        (WebInspector.HeapProfileHeader):
+        (WebInspector.HeapProfileHeader.prototype.canSaveToFile):
+        (WebInspector.HeapProfileHeader.prototype.saveToFile):
+        * inspector/front-end/ProfilesPanel.js:
+        (WebInspector.ProfileHeader):
+        (WebInspector.ProfileHeader.prototype.loadFromFile):
+        (WebInspector.ProfileHeader.prototype.fromFile):
+        (WebInspector.ProfilesPanel.prototype._loadFromFile):
+
 2012-05-14  Andrey Kosyakov  <caseq@chromium.org>
 

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

@@ -453 +453 @@
     {
         var selectedNode = event.target.selectedNode;
-        if (selectedNode instanceof WebInspector.HeapSnapshotGenericObjectNode)
+        if (!this.profile.fromFile() && selectedNode instanceof WebInspector.HeapSnapshotGenericObjectNode)
             ConsoleAgent.addInspectedHeapObject(selectedNode.snapshotNodeId);
     },
@@ -560 +560 @@
     _resolveObjectForPopover: function(element, showCallback, objectGroupName)
     {
+        if (this.profile.fromFile())
+            return;
         element.node.queryObjectContent(showCallback, objectGroupName);
     },
@@ -689 +691 @@
         }
 
-        if (this.profile._fromFile)
+        if (this.profile.fromFile())
             return;
         for (var i = this.filterSelectElement.length - 1, n = list.length; i < n; ++i) {
@@ -794 +796 @@
     this.maxJSObjectId = maxJSObjectId;
     this._loaded = false;
-    this._fromFile = false;
     this._totalNumberOfChunks = 0;
 }
@@ -885 +886 @@
     canSaveToFile: function()
     {
-        return !this._fromFile && this._loaded && !this._savedChunksCount && WebInspector.fileManager.canAppend();
+        return !this.fromFile() && this._loaded && !this._savedChunksCount && WebInspector.fileManager.canAppend();
     },
 
@@ -908 +909 @@
         }
 
-        this._fileName = this._fileName || "Heap-" + new Date().toISO8601Compact() + ".json";
+        this._fileName = this._fileName || "Heap-" + new Date().toISO8601Compact() + ".heapsnapshot";
         WebInspector.fileManager.addEventListener(WebInspector.FileManager.EventTypes.SavedURL, startSavingSnapshot, this);
         WebInspector.fileManager.save(this._fileName, "", true);
@@ -943 +944 @@
         }
 
-        this._fromFile = true;
         this.title = file.name;
         this.sidebarElement.subtitle = WebInspector.UIString("Loading\u2026");

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

@@ -140 +140 @@
         this.isTemporary = false;
     }
+    this._fromFile = false;
 }
 
@@ -163 +164 @@
      * @param {File} file
      */
-    loadFromFile: function(file) { throw new Error("Needs implemented"); }
+    loadFromFile: function(file) { throw new Error("Needs implemented"); },
+
+    /**
+     * @return {boolean}
+     */
+    fromFile: function() { return this._fromFile; }
 }
 
@@ -270 +276 @@
         this.addProfileHeader(temporaryProfile);
 
+        temporaryProfile._fromFile = true;
         temporaryProfile.loadFromFile(file);
         this._createFileSelectorElement();