| 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 06905974c5017c0c9bfd2489a341f9d04d3a1b4d..9cb98b3653011eb2f54056867ee095b392de4f8a 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js
|
| @@ -497,8 +497,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();
|
| },
|
|
|
| @@ -942,7 +942,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);
|
|
|