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

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: Rebased Created 4 years, 5 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 26fc6ca8f610b2ec3fbadfb73c1ecb0d365a8e1d..0554468fcf5d70fe53c8f765aa8acb0d2d2eedd0 100644
--- a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
+++ b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
@@ -484,8 +484,11 @@ 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()) {
dgozman 2016/07/14 16:29:28 browser capability
eostroukhov-old 2016/07/20 23:46:15 Done.
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(target);
+ if (resourceTreeModel)
+ resourceTreeModel.forAllResources(pushResourceData.bind(this));
+ }
return Object.values(resources);
},
@@ -929,7 +932,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