Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(881)

Unified Diff: third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js

Issue 2897713002: DevTools: ResourceTreeModel should not report resources twice (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/inspector/resource-tree/iframe-main-resource-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 16a0c772c8340984cc20ee6d252f18faa0160b8a..85311fc85436994fbabf1e55d3d5cb2288190cae 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
@@ -321,10 +321,6 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
var frame = new SDK.ResourceTreeFrame(this, parentFrame, framePayload.id, framePayload, null);
this._addFrame(frame);
- var frameResource = this._createResourceFromFramePayload(
- framePayload, framePayload.url, Common.resourceTypes.Document, framePayload.mimeType, null, null);
- frame.addResource(frameResource);
-
for (var i = 0; frameTreePayload.childFrames && i < frameTreePayload.childFrames.length; ++i)
this._addFramesRecursively(frame, frameTreePayload.childFrames[i]);
@@ -335,6 +331,12 @@ SDK.ResourceTreeModel = class extends SDK.SDKModel {
subresource.lastModified || null, subresource.contentSize || null);
frame.addResource(resource);
}
+
+ if (!frame._resourcesMap[framePayload.url]) {
+ var frameResource = this._createResourceFromFramePayload(
+ framePayload, framePayload.url, Common.resourceTypes.Document, framePayload.mimeType, null, null);
+ frame.addResource(frameResource);
+ }
}
/**
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/inspector/resource-tree/iframe-main-resource-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698