DevTools: Get rid of WebInspector.debuggerModel in NetworkUISourceCodeProvider

Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js

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..c91b786b20764bbf7e16118d6ea959649dbabca1 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(target, resources[i]));
         }
 
-        populateFrame.call(this, WebInspector.resourceTreeModel.mainFrame);
+        var mainFrame = target.resourceTreeModel.mainFrame;
+        if (mainFrame)
+            populateFrame.call(this, mainFrame);
     },
 
     /**
@@ -115,12 +120,13 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
     },
 
     /**
-     * @param {!WebInspector.Event|!{data: !WebInspector.Resource}} event
+     * @param {!WebInspector.Event} event
      */
     _resourceAdded: function(event)
     {
         var resource = /** @type {!WebInspector.Resource} */ (event.data);
-        this._addFile(resource.url, new WebInspector.NetworkUISourceCodeProvider.FallbackResource(resource));
+        var target = /** @type {!WebInspector.Target} */ (event.target.target());
+        this._addFile(resource.url, new WebInspector.NetworkUISourceCodeProvider.FallbackResource(target, resource));
     },
 
     /**
@@ -128,7 +134,9 @@ WebInspector.NetworkUISourceCodeProvider.prototype = {
      */
     _mainFrameNavigated: function(event)
     {
-        this._reset();
+        var target = /** @type {!WebInspector.Target} */ (event.target.target());

[vsevik, 2014/06/26 13:11:33]

please cast event.target instead, otherwise it's not clear what's going on here.

[sergeyv, 2014/06/26 14:55:59]

Done.

+        //We assume that mainFrameNavigated could be fired only in one main target
+        this._reset(target);
     },
 
     /**
@@ -150,21 +158,27 @@ 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);
     }
 }
 
 /**
  * @constructor
+ * @extends {WebInspector.TargetAware}
  * @implements {WebInspector.ContentProvider}
+ * @param {!WebInspector.Target} target
  * @param {!WebInspector.Resource} resource
  */
-WebInspector.NetworkUISourceCodeProvider.FallbackResource = function(resource)
+WebInspector.NetworkUISourceCodeProvider.FallbackResource = function(target, resource)

[vsevik, 2014/06/26 13:11:33]

Let's make Resource TargetAware instead.

[sergeyv, 2014/06/26 14:56:00]

Done.

 {
+    WebInspector.TargetAware.call(this, target);
     this._resource = resource;
 }
 
@@ -196,7 +210,7 @@ WebInspector.NetworkUISourceCodeProvider.FallbackResource.prototype = {
          */
         function loadFallbackContent()
         {
-            var scripts = WebInspector.debuggerModel.scriptsForSourceURL(this._resource.url);
+            var scripts = this.target().debuggerModel.scriptsForSourceURL(this._resource.url);
             if (!scripts.length) {
                 callback(null);
                 return;
@@ -256,7 +270,9 @@ WebInspector.NetworkUISourceCodeProvider.FallbackResource.prototype = {
         }
 
         this._resource.searchInContent(query, caseSensitive, isRegex, callback);
-    }
+    },
+
+    __proto__: WebInspector.TargetAware.prototype
 }
 
 /**