Index: Source/devtools/front_end/bindings/NetworkProject.js |
diff --git a/Source/devtools/front_end/bindings/NetworkProject.js b/Source/devtools/front_end/bindings/NetworkProject.js |
index 09f14624f8a558916cc95a56ec6391acb51f9bc7..33364e77c63400490bb9d0ee2f4217dac6eea841 100644 |
--- a/Source/devtools/front_end/bindings/NetworkProject.js |
+++ b/Source/devtools/front_end/bindings/NetworkProject.js |
@@ -156,6 +156,7 @@ |
this._processedURLs = {}; |
target[WebInspector.NetworkProject._networkProjectSymbol] = this; |
+ target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this); |
target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
var debuggerModel = WebInspector.DebuggerModel.fromTarget(target); |
@@ -168,11 +169,6 @@ |
cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetAdded, this._styleSheetAdded, this); |
cssModel.addEventListener(WebInspector.CSSStyleModel.Events.StyleSheetRemoved, this._styleSheetRemoved, this); |
} |
- |
- if (debuggerModel && !debuggerModel.debuggerEnabled()) |
- debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerEnabled, this); |
- else |
- this._debuggerEnabled(); |
} |
WebInspector.NetworkProject._networkProjectSymbol = Symbol("networkProject"); |
@@ -278,15 +274,6 @@ |
projectDelegate.removeFile(path); |
}, |
- _debuggerEnabled: function() |
- { |
- var debuggerModel = WebInspector.DebuggerModel.fromTarget(this.target()); |
- if (debuggerModel) |
- debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerEnabled, this); |
- this._populate(); |
- this.target().resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this); |
- }, |
- |
_populate: function() |
{ |
/** |
@@ -406,7 +393,6 @@ |
target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this); |
var debuggerModel = WebInspector.DebuggerModel.fromTarget(target); |
if (debuggerModel) { |
- debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerWasEnabled, this._debuggerEnabled, this); |
debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this); |
debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.FailedToParseScriptSource, this._parsedScriptSource, this); |
} |
@@ -465,48 +451,46 @@ |
requestContent: function(callback) |
{ |
/** |
- * @param {!WebInspector.Target} target |
- * @param {string} url |
- * @return {!Array.<!WebInspector.Script>} |
+ * @this {WebInspector.NetworkProject.FallbackResource} |
*/ |
- function findScripts(target, url) |
+ function loadFallbackContent() |
{ |
- var debuggerModel = WebInspector.DebuggerModel.fromTarget(target); |
- return debuggerModel ? debuggerModel.scriptsForSourceURL(url) : []; |
+ var debuggerModel = WebInspector.DebuggerModel.fromTarget(this._resource.target()); |
+ if (!debuggerModel) { |
+ callback(null); |
+ return; |
+ } |
+ var scripts = debuggerModel.scriptsForSourceURL(this._resource.url); |
+ if (!scripts.length) { |
+ callback(null); |
+ return; |
+ } |
+ |
+ var contentProvider; |
+ var type = this._resource.resourceType(); |
+ if (type === WebInspector.resourceTypes.Document) |
+ contentProvider = new WebInspector.ConcatenatedScriptsContentProvider(scripts); |
+ else if (type === WebInspector.resourceTypes.Script) |
+ contentProvider = scripts[0]; |
+ |
+ console.assert(contentProvider, "Resource content request failed. " + this._resource.url); |
+ |
+ contentProvider.requestContent(callback); |
} |
/** |
* @param {?string} content |
* @this {WebInspector.NetworkProject.FallbackResource} |
*/ |
- function loadFallbackContent(content) |
+ function requestContentLoaded(content) |
{ |
- if (content) { |
- callback(content); |
- return; |
- } |
- |
- if (this._resource.resourceType() !== WebInspector.resourceTypes.Document) { |
- callback(null); |
- return; |
- } |
- |
- var scripts = findScripts(this._resource.target(), this._resource.url); |
- if (scripts.length) |
- new WebInspector.ConcatenatedScriptsContentProvider(scripts).requestContent(callback); |
+ if (content) |
+ callback(content) |
else |
- callback(null); |
- } |
- |
- if (this._resource.resourceType() === WebInspector.resourceTypes.Script) { |
- var scripts = findScripts(this._resource.target(), this._resource.url); |
- if (scripts.length) { |
- scripts[0].requestContent(callback); |
- return; |
- } |
- } |
- |
- this._resource.requestContent(loadFallbackContent.bind(this)); |
+ loadFallbackContent.call(this); |
+ } |
+ |
+ this._resource.requestContent(requestContentLoaded.bind(this)); |
}, |
/** |