Changeset 140306 in webkit

Timestamp:

Jan 20, 2013 11:50:51 PM (11 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: change HeapSnapshotLoader to allow loading native heap snapshots
​https://bugs.webkit.org/show_bug.cgi?id=107282

Reviewed by Pavel Feldman.

Conctete heap snapshot constructor name is passed as a parameter to HeapSnapshotLoaderProxy and
propagated to HeapSnapshotLoader.buildSnapshot to support different types of heap snapshots.

Source/WebCore:

• inspector/front-end/HeapSnapshotLoader.js:

(WebInspector.HeapSnapshotLoader.prototype.buildSnapshot):

• inspector/front-end/HeapSnapshotProxy.js:

(WebInspector.HeapSnapshotWorker.prototype.createLoader):
(WebInspector.HeapSnapshotLoaderProxy):
(WebInspector.HeapSnapshotLoaderProxy.prototype.close):

• inspector/front-end/HeapSnapshotView.js:

(WebInspector.HeapProfileHeader.prototype._setupWorker):

LayoutTests:

• inspector/profiler/heap-snapshot-loader.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/profiler/heap-snapshot-loader.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/HeapSnapshotLoader.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/HeapSnapshotProxy.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/HeapSnapshotView.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-20  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: change HeapSnapshotLoader to allow loading native heap snapshots
+        https://bugs.webkit.org/show_bug.cgi?id=107282
+
+        Reviewed by Pavel Feldman.
+
+        Conctete heap snapshot constructor name is passed as a parameter to HeapSnapshotLoaderProxy and
+        propagated to HeapSnapshotLoader.buildSnapshot to support different types of heap snapshots.
+
+        * inspector/profiler/heap-snapshot-loader.html:
+
 2013-01-20  Kentaro Hara  <haraken@chromium.org>
 

trunk/LayoutTests/inspector/profiler/heap-snapshot-loader.html

@@ -56 +56 @@
                 loader.write(sourceStringified.slice(i, i + partSize));
             loader.close();
-            var result = loader.buildSnapshot();
+            var result = loader.buildSnapshot("JSHeapSnapshot");
             result._nodes = new Uint32Array(result._nodes);
             result._containmentEdges = new Uint32Array(result._containmentEdges);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-20  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: change HeapSnapshotLoader to allow loading native heap snapshots
+        https://bugs.webkit.org/show_bug.cgi?id=107282
+
+        Reviewed by Pavel Feldman.
+
+        Conctete heap snapshot constructor name is passed as a parameter to HeapSnapshotLoaderProxy and
+        propagated to HeapSnapshotLoader.buildSnapshot to support different types of heap snapshots.
+
+        * inspector/front-end/HeapSnapshotLoader.js:
+        (WebInspector.HeapSnapshotLoader.prototype.buildSnapshot):
+        * inspector/front-end/HeapSnapshotProxy.js:
+        (WebInspector.HeapSnapshotWorker.prototype.createLoader):
+        (WebInspector.HeapSnapshotLoaderProxy):
+        (WebInspector.HeapSnapshotLoaderProxy.prototype.close):
+        * inspector/front-end/HeapSnapshotView.js:
+        (WebInspector.HeapProfileHeader.prototype._setupWorker):
+
 2013-01-20  Kentaro Hara  <haraken@chromium.org>
 

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

@@ -57 +57 @@
     },
 
-    buildSnapshot: function()
+    buildSnapshot: function(constructorName)
     {
-        var result = new WebInspector.JSHeapSnapshot(this._snapshot);
+        var constructor = WebInspector[constructorName];
+        var result = new constructor(this._snapshot);
         this._reset();
         return result;

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

@@ -189 +189 @@
 
 WebInspector.HeapSnapshotWorker.prototype = {
-    createObject: function(constructorName)
-    {
-        var proxyConstructorFunction = this._findFunction(constructorName + "Proxy");
+    createLoader: function(snapshotConstructorName)
+    {
         var objectId = this._nextObjectId++;
-        var proxy = new proxyConstructorFunction(this, objectId);
-        this._postMessage({callId: this._nextCallId++, disposition: "create", objectId: objectId, methodName: constructorName});
+        var proxy = new WebInspector.HeapSnapshotLoaderProxy(this, objectId, snapshotConstructorName);
+        this._postMessage({callId: this._nextCallId++, disposition: "create", objectId: objectId, methodName: "WebInspector.HeapSnapshotLoader"});
         return proxy;
     },
@@ -361 +360 @@
  * @implements {WebInspector.OutputStream}
  */
-WebInspector.HeapSnapshotLoaderProxy = function(worker, objectId)
+WebInspector.HeapSnapshotLoaderProxy = function(worker, objectId, snapshotConstructorName)
 {
     WebInspector.HeapSnapshotProxyObject.call(this, worker, objectId);
+    this._snapshotConstructorName = snapshotConstructorName;
     this._pendingSnapshotConsumers = [];
 }
@@ -389 +389 @@
         function buildSnapshot()
         {
-            this.callFactoryMethod(updateStaticData.bind(this), "buildSnapshot", "WebInspector.HeapSnapshotProxy");
+            this.callFactoryMethod(updateStaticData.bind(this), "buildSnapshot", "WebInspector.HeapSnapshotProxy", this._snapshotConstructorName);
         }
         function updateStaticData(snapshotProxy)

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

@@ -874 +874 @@
         var worker = new WebInspector.HeapSnapshotWorker();
         worker.addEventListener("wait", setProfileWait, this);
-        var loaderProxy = worker.createObject("WebInspector.HeapSnapshotLoader");
+        var loaderProxy = worker.createLoader("JSHeapSnapshot");
         loaderProxy.addConsumer(this._snapshotReceived.bind(this));
         this._receiver = loaderProxy;