Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / HeapSnapshotProxy.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/HeapSnapshotProxy.js b/src/third_party/WebKit/Source/devtools/front_end/HeapSnapshotProxy.js
index 774d416..af4f4e0 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/HeapSnapshotProxy.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/HeapSnapshotProxy.js
@@ -42,22 +42,18 @@ WebInspector.HeapSnapshotWorkerProxy = function(eventHandler)
     this._previousCallbacks = [];
     this._worker = new Worker("HeapSnapshotWorker.js");
     this._worker.onmessage = this._messageReceived.bind(this);
-    if (WebInspector.HeapSnapshotView.allocationProfilerEnabled)
-        this._postMessage({disposition: "enableAllocationProfiler"});
 }
 
 WebInspector.HeapSnapshotWorkerProxy.prototype = {
     /**
-     * @param {string} snapshotConstructorName
-     * @param {function(new:T, ...[?])} proxyConstructor
+     * @param {number} profileUid
      * @param {function(!WebInspector.HeapSnapshotProxy)} snapshotReceivedCallback
      * @return {!WebInspector.HeapSnapshotLoaderProxy}
-     * @template T
      */
-    createLoader: function(snapshotConstructorName, proxyConstructor, snapshotReceivedCallback)
+    createLoader: function(profileUid, snapshotReceivedCallback)
     {
         var objectId = this._nextObjectId++;
-        var proxy = new WebInspector.HeapSnapshotLoaderProxy(this, objectId, snapshotConstructorName, proxyConstructor, snapshotReceivedCallback);
+        var proxy = new WebInspector.HeapSnapshotLoaderProxy(this, objectId, profileUid, snapshotReceivedCallback);
         this._postMessage({callId: this._nextCallId++, disposition: "create", objectId: objectId, methodName: "WebInspector.HeapSnapshotLoader"});
         return proxy;
     },
@@ -202,6 +198,7 @@ WebInspector.HeapSnapshotWorkerProxy.prototype = {
 
 /**
  * @constructor
+ * @param {number} objectId
  */
 WebInspector.HeapSnapshotProxyObject = function(worker, objectId)
 {
@@ -233,7 +230,7 @@ WebInspector.HeapSnapshotProxyObject.prototype = {
     /**
      * @param {?function(...[?])} callback
      * @param {string} methodName
-     * @param {function (new:WebInspector.HeapSnapshotProviderProxy, ...[?])} proxyConstructor
+     * @param {function (new:T, ...[?])} proxyConstructor
      * @param {...*} var_args
      * @return {?WebInspector.HeapSnapshotProviderProxy}
      * @template T
@@ -275,16 +272,14 @@ WebInspector.HeapSnapshotProxyObject.prototype = {
  * @constructor
  * @extends {WebInspector.HeapSnapshotProxyObject}
  * @implements {WebInspector.OutputStream}
- * @param {string} snapshotConstructorName
- * @param {function(new:T, ...[?])} proxyConstructor
+ * @param {number} objectId
+ * @param {number} profileUid
  * @param {function(!WebInspector.HeapSnapshotProxy)} snapshotReceivedCallback
- * @template T
  */
-WebInspector.HeapSnapshotLoaderProxy = function(worker, objectId, snapshotConstructorName, proxyConstructor, snapshotReceivedCallback)
+WebInspector.HeapSnapshotLoaderProxy = function(worker, objectId, profileUid, snapshotReceivedCallback)
 {
     WebInspector.HeapSnapshotProxyObject.call(this, worker, objectId);
-    this._snapshotConstructorName = snapshotConstructorName;
-    this._proxyConstructor = proxyConstructor;
+    this._profileUid = profileUid;
     this._snapshotReceivedCallback = snapshotReceivedCallback;
 }
 
@@ -310,15 +305,17 @@ WebInspector.HeapSnapshotLoaderProxy.prototype = {
         {
             if (callback)
                 callback();
-            this.callFactoryMethod(updateStaticData.bind(this), "buildSnapshot", this._proxyConstructor, this._snapshotConstructorName);
+            this.callFactoryMethod(updateStaticData.bind(this), "buildSnapshot", WebInspector.HeapSnapshotProxy);
         }
 
         /**
+         * @param {!WebInspector.HeapSnapshotProxy} snapshotProxy
          * @this {WebInspector.HeapSnapshotLoaderProxy}
          */
         function updateStaticData(snapshotProxy)
         {
             this.dispose();
+            snapshotProxy.setProfileUid(this._profileUid);
             snapshotProxy.updateStaticData(this._snapshotReceivedCallback.bind(this));
         }
 
@@ -333,7 +330,7 @@ WebInspector.HeapSnapshotLoaderProxy.prototype = {
  * @constructor
  * @extends {WebInspector.HeapSnapshotProxyObject}
  * @param {!WebInspector.HeapSnapshotWorkerProxy} worker
- * @param {string} objectId
+ * @param {number} objectId
  */
 WebInspector.HeapSnapshotProxy = function(worker, objectId)
 {
@@ -481,7 +478,12 @@ WebInspector.HeapSnapshotProxy.prototype = {
 
     get uid()
     {
-        return this._staticData.uid;
+        return this._profileUid;
+    },
+
+    setProfileUid: function(profileUid)
+    {
+        this._profileUid = profileUid;
     },
 
     /**
@@ -499,6 +501,8 @@ WebInspector.HeapSnapshotProxy.prototype = {
 /**
  * @constructor
  * @extends {WebInspector.HeapSnapshotProxyObject}
+ * @param {!WebInspector.HeapSnapshotWorkerProxy} worker
+ * @param {number} objectId
  */
 WebInspector.HeapSnapshotProviderProxy = function(worker, objectId)
 {