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

Unified Diff: third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js

Issue 2122353002: [DevTools] Make resource tree model optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments Created 4 years, 4 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
Index: third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
diff --git a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
index a55cd3c0a17207416a5889f5c3b2dbdc030b58e6..ab0b22ad4046124a95d978d9f941cb5897417b01 100644
--- a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
+++ b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
@@ -498,8 +498,8 @@ WebInspector.ExtensionServer.prototype = {
var uiSourceCodes = WebInspector.workspace.uiSourceCodesForProjectType(WebInspector.projectTypes.Network);
uiSourceCodes = uiSourceCodes.concat(WebInspector.workspace.uiSourceCodesForProjectType(WebInspector.projectTypes.ContentScripts));
uiSourceCodes.forEach(pushResourceData.bind(this));
- for (var target of WebInspector.targetManager.targets())
- target.resourceTreeModel.forAllResources(pushResourceData.bind(this));
+ for (var target of WebInspector.targetManager.targets(WebInspector.Target.Capability.DOM))
+ WebInspector.ResourceTreeModel.fromTarget(target).forAllResources(pushResourceData.bind(this));
return resources.valuesArray();
},
@@ -943,7 +943,14 @@ WebInspector.ExtensionServer.prototype = {
}
if (typeof options === "object") {
- var frame = options.frameURL ? resolveURLToFrame(options.frameURL) : WebInspector.targetManager.mainTarget().resourceTreeModel.mainFrame;
+ var frame;
+ if (options.frameURL) {
+ frame = resolveURLToFrame(options.frameURL);
+ } else {
+ var target = WebInspector.targetManager.mainTarget();
+ var resourceTreeModel = target && WebInspector.ResourceTreeModel.fromTarget(target);
+ frame = resourceTreeModel && resourceTreeModel.mainFrame;
+ }
if (!frame) {
if (options.frameURL)
console.warn("evaluate: there is no frame with URL " + options.frameURL);

Powered by Google App Engine
This is Rietveld 408576698