DevTools: Get rid of WebInspector.debuggerModel in NetworkUISourceCodeProvider

Source/devtools/front_end/sdk/NetworkUISourceCodeProvider.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
      */
     targetRemoved: function(target)
     {
         // FIXME: add workspace cleanup here.
         target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, this._resourceAdded, this);
         target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, this._mainFrameNavigated, this);
         target.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.ParsedScriptSource, this._parsedScriptSource, this);
         target.cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.StyleSheetAdded, this._styleSheetAdded, this);
     },
 
-    _populate: function()
+    /**
+     * @param {!WebInspector.Target} target
+     */
+    _populate: function(target)
     {
         /**
          * @param {!WebInspector.ResourceTreeFrame} frame
          * @this {WebInspector.NetworkUISourceCodeProvider}
          */
         function populateFrame(frame)
         {
             for (var i = 0; i < frame.childFrames.length; ++i)
                 populateFrame.call(this, frame.childFrames[i]);
 
             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);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _parsedScriptSource: function(event)
     {
         var script = /** @type {!WebInspector.Script} */ (event.data);
         if (!script.sourceURL || script.isInlineScript() || script.isSnippet())
             return;
@@ skipping 12 matching lines @@
     _styleSheetAdded: function(event)
     {
         var header = /** @type {!WebInspector.CSSStyleSheetHeader} */ (event.data);
         if ((!header.hasSourceURL || header.isInline) && header.origin !== "inspector")
             return;
 
         this._addFile(header.resourceURL(), header, false);
     },
 
     /**
-     * @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));
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _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);
     },
 
     /**
      * @param {string} url
      * @param {!WebInspector.ContentProvider} contentProvider
      * @param {boolean=} isContentScript
      */
     _addFile: function(url, contentProvider, isContentScript)
     {
         if (this._workspace.hasMappingForURL(url))
             return;
 
         var type = contentProvider.contentType();
         if (type !== WebInspector.resourceTypes.Stylesheet && type !== WebInspector.resourceTypes.Document && type !== WebInspector.resourceTypes.Script)
             return;
         if (this._processedURLs[url])
             return;
         this._processedURLs[url] = true;
         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;
 }
 
 WebInspector.NetworkUISourceCodeProvider.FallbackResource.prototype = {
 
     /**
      * @return {string}
      */
     contentURL: function()
     {
@@ skipping 11 matching lines @@
     /**
      * @param {function(?string)} callback
      */
     requestContent: function(callback)
     {
         /**
          * @this {WebInspector.NetworkUISourceCodeProvider.FallbackResource}
          */
         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;
             }
 
             var contentProvider;
             if (this._resource.type === WebInspector.resourceTypes.Document)
                 contentProvider = new WebInspector.ConcatenatedScriptsContentProvider(scripts);
             else if (this._resource.type === WebInspector.resourceTypes.Script)
                 contentProvider = scripts[0];
@@ skipping 39 matching lines @@
             var result = WebInspector.ContentProvider.performSearchInContent(content, query, caseSensitive, isRegex);
             callback(result);
         }
 
         if (this.contentType() === WebInspector.resourceTypes.Document) {
             this.requestContent(documentContentLoaded);
             return;
         }
 
         this._resource.searchInContent(query, caseSensitive, isRegex, callback);
-    }
+    },
+
+    __proto__: WebInspector.TargetAware.prototype
 }
 
 /**
  * @type {!WebInspector.NetworkWorkspaceBinding}
  */
 WebInspector.networkWorkspaceBinding;