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

Unified Diff: Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js

Issue 356033002: DevTools: Get rid of WebInspector.debuggerModel in NetworkUISourceCodeProvider (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address vsevik's comments Created 6 years, 6 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: Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js
diff --git a/Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js b/Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js
index 851cca6f04aa4887ca085b68960f73ce9bc4d769..a248d5d6fd2c7c6a8a85dee07a5606f7562b8c41 100644
--- a/Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js
+++ b/Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js
@@ -66,7 +66,10 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
target.cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
},
- _populate: function()
+ /**
+ * @param {!WebInspector.Target} target
+ */
+ _populate: function(target)
{
/**
* @param {!WebInspector.ResourceTreeFrame} frame
@@ -79,10 +82,12 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
var resources = frame.resources();
for (var i = 0; i < resources.length; ++i)
- this._resourceAdded({data:resources[i]});
+ this._addFile(resources[i].url, new WebInspector.NetworkUISourceCodeProvider.FallbackResource(resources[i]));
}
- populateFrame.call(this, WebInspector.resourceTreeModel.mainFrame);
+ var mainFrame = target.resourceTreeModel.mainFrame;
+ if (mainFrame)
+ populateFrame.call(this, mainFrame);
},
/**
@@ -115,7 +120,7 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
},
/**
- * @param {!WebInspector.Event|!{data: !WebInspector.Resource}} event
+ * @param {!WebInspector.Event} event
*/
_resourceAdded: function(event)
{
@@ -128,7 +133,9 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
*/
_mainFrameNavigated: function(event)
{
- this._reset();
+ var resourceTreeModel = /** @type {!WebInspector.ResourceTreeModel} */ (event.target);
+ //We assume that mainFrameNavigated could be fired only in one main target
+ this._reset(resourceTreeModel.target());
},
/**
@@ -150,11 +157,14 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
this._networkWorkspaceBinding.addFileForURL(url, contentProvider, isContentScript);
},
- _reset: function()
+ /**
+ * @param {!WebInspector.Target} target
+ */
+ _reset: function(target)
{
this._processedURLs = {};
this._networkWorkspaceBinding.reset();
- this._populate();
+ this._populate(target);
}
}
@@ -196,7 +206,7 @@ WebInspector.NetworkUISourceCodeProvider.FallbackResource.prototype = {
*/
function loadFallbackContent()
{
- var scripts = WebInspector.debuggerModel.scriptsForSourceURL(this._resource.url);
+ var scripts = this._resource.target().debuggerModel.scriptsForSourceURL(this._resource.url);
if (!scripts.length) {
callback(null);
return;
« no previous file with comments | « LayoutTests/inspector/sources/debugger/network-uisourcecode-provider.html ('k') | Source/devtools/front_end/sdk/Resource.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698