Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| index 2464fdd987868dcc970c752990692704be97aee1..cc26144fd0d967b1049c8b113b33d2bf73aa961d 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js |
| @@ -138,17 +138,22 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel { |
| /** |
| * @param {!Protocol.Page.FrameId} frameId |
| * @param {?Protocol.Page.FrameId} parentFrameId |
| + * @param {!Protocol.Runtime.StackTrace=} stackTrace |
| * @return {?SDK.ResourceTreeFrame} |
| */ |
| - _frameAttached(frameId, parentFrameId) { |
| + _frameAttached(frameId, parentFrameId, stackTrace) { |
| // Do nothing unless cached resource tree is processed - it will overwrite everything. |
| if (!this._cachedResourcesProcessed && parentFrameId) |
| return null; |
| if (this._frames.has(frameId)) |
| return null; |
| + var callFrames = null; |
| + if (stackTrace && stackTrace.callFrames) |
| + callFrames = stackTrace.callFrames; |
| + |
| var parentFrame = parentFrameId ? (this._frames.get(parentFrameId) || null) : null; |
| - var frame = new SDK.ResourceTreeFrame(this, parentFrame, frameId); |
| + var frame = new SDK.ResourceTreeFrame(this, parentFrame, frameId, null, callFrames); |
| if (frame.isMainFrame() && this.mainFrame) { |
| // Navigation to the new backend process. |
| this._frameDetached(this.mainFrame.id); |
| @@ -299,7 +304,7 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel { |
| */ |
| _addFramesRecursively(parentFrame, frameTreePayload) { |
| var framePayload = frameTreePayload.frame; |
| - var frame = new SDK.ResourceTreeFrame(this, parentFrame, framePayload.id, framePayload); |
| + var frame = new SDK.ResourceTreeFrame(this, parentFrame, framePayload.id, framePayload, null); |
| this._addFrame(frame); |
| var frameResource = this._createResourceFromFramePayload( |
| @@ -473,9 +478,10 @@ SDK.ResourceTreeFrame = class { |
| * @param {!SDK.ResourceTreeModel} model |
| * @param {?SDK.ResourceTreeFrame} parentFrame |
| * @param {!Protocol.Page.FrameId} frameId |
| - * @param {!Protocol.Page.Frame=} payload |
| + * @param {?Protocol.Page.Frame} payload |
| + * @param {?Array<!Protocol.Runtime.CallFrame>} callFrames |
| */ |
| - constructor(model, parentFrame, frameId, payload) { |
| + constructor(model, parentFrame, frameId, payload, callFrames) { |
|
dgozman
2017/03/20 17:53:37
creationStackTrace
allada
2017/03/21 00:19:20
Done.
|
| this._model = model; |
| this._parentFrame = parentFrame; |
| this._id = frameId; |
| @@ -489,6 +495,8 @@ SDK.ResourceTreeFrame = class { |
| this._mimeType = payload.mimeType; |
| } |
| + this._constructionCallFrames = callFrames; |
|
dgozman
2017/03/20 17:53:37
_creationStackTrace
allada
2017/03/21 00:19:20
Done.
|
| + |
| /** |
| * @type {!Array.<!SDK.ResourceTreeFrame>} |
| */ |
| @@ -767,9 +775,10 @@ SDK.PageDispatcher = class { |
| * @override |
| * @param {!Protocol.Page.FrameId} frameId |
| * @param {!Protocol.Page.FrameId} parentFrameId |
| + * @param {!Protocol.Runtime.StackTrace=} stackTrace |
| */ |
| - frameAttached(frameId, parentFrameId) { |
| - this._resourceTreeModel._frameAttached(frameId, parentFrameId); |
| + frameAttached(frameId, parentFrameId, stackTrace) { |
| + this._resourceTreeModel._frameAttached(frameId, parentFrameId, stackTrace); |
| } |
| /** |