DevTools: remove WI.NetworkMapping.networkURL

third_party/WebKit/Source/devtools/front_end/bindings/ResourceScriptMapping.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 24 matching lines @@
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.NetworkMapping} networkMapping
  * @param {!WebInspector.DebuggerWorkspaceBinding} debuggerWorkspaceBinding
  */
 WebInspector.ResourceScriptMapping = function(debuggerModel, workspace, networkMapping, debuggerWorkspaceBinding)
 {
     this._target = debuggerModel.target();
     this._debuggerModel = debuggerModel;
     this._networkMapping = networkMapping;
     this._debuggerWorkspaceBinding = debuggerWorkspaceBinding;
-    /** @type {!Array.<!WebInspector.UISourceCode>} */
-    this._boundUISourceCodes = [];
+    /** @type {!Set<!WebInspector.UISourceCode>} */
+    this._boundUISourceCodes = new Set();
 
     /** @type {!Map.<!WebInspector.UISourceCode, !WebInspector.ResourceScriptFile>} */
     this._uiSourceCodeToScriptFile = new Map();
 
     this._eventListeners = [
         debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.GlobalObjectCleared, this._debuggerReset, this),
         workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this),
         workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this)
     ];
 }
@@ skipping 96 matching lines @@
         else
             this._uiSourceCodeToScriptFile.remove(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _uiSourceCodeAdded: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
-        if (!this._networkMapping.networkURL(uiSourceCode))
-            return;
         if (uiSourceCode.isFromServiceProject())
             return;
-
         var scripts = this._scriptsForUISourceCode(uiSourceCode);
         if (!scripts.length)
             return;
 
         this._bindUISourceCodeToScripts(uiSourceCode, scripts);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _uiSourceCodeRemoved: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
-        if (!this._networkMapping.networkURL(uiSourceCode))
-            return;
-        if (uiSourceCode.isFromServiceProject())
+        if (uiSourceCode.isFromServiceProject() || !this._boundUISourceCodes.has(uiSourceCode))
             return;
 
         this._unbindUISourceCode(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _updateLocations: function(uiSourceCode)
     {
@@ skipping 15 matching lines @@
         return this._networkMapping.uiSourceCodeForScriptURL(script.sourceURL, script);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @return {!Array.<!WebInspector.Script>}
      */
     _scriptsForUISourceCode: function(uiSourceCode)
     {
         var target = WebInspector.NetworkProject.targetForUISourceCode(uiSourceCode);
-        if (target && target !== this._debuggerModel.target())
+        if (target !== this._debuggerModel.target())
             return [];
-        if (!this._networkMapping.networkURL(uiSourceCode))
-            return [];
-        return this._debuggerModel.scriptsForSourceURL(this._networkMapping.networkURL(uiSourceCode));
+        return this._debuggerModel.scriptsForSourceURL(uiSourceCode.url());
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!Array.<!WebInspector.Script>} scripts
      */
     _bindUISourceCodeToScripts: function(uiSourceCode, scripts)
     {
         console.assert(scripts.length);
         // Due to different listeners order, a script file could be created just before uiSourceCode
         // for the corresponding script was created. Check that we don't create scriptFile twice.
         var boundScriptFile = this.scriptFile(uiSourceCode);
         if (boundScriptFile && boundScriptFile._hasScripts(scripts))
             return;
 
         var scriptFile = new WebInspector.ResourceScriptFile(this, uiSourceCode, scripts);
         this._setScriptFile(uiSourceCode, scriptFile);
         for (var i = 0; i < scripts.length; ++i)
             this._debuggerWorkspaceBinding.updateLocations(scripts[i]);
         this._debuggerWorkspaceBinding.setSourceMapping(this._target, uiSourceCode, this);
-        this._boundUISourceCodes.push(uiSourceCode);
+        this._boundUISourceCodes.add(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _unbindUISourceCode: function(uiSourceCode)
     {
         var scriptFile = this.scriptFile(uiSourceCode);
         if (scriptFile) {
             scriptFile.dispose();
             this._setScriptFile(uiSourceCode, null);
         }
         this._debuggerWorkspaceBinding.setSourceMapping(this._target, uiSourceCode, null);
-        this._boundUISourceCodes.remove(uiSourceCode);
+        this._boundUISourceCodes.delete(uiSourceCode);
     },
 
     _debuggerReset: function()
     {
-        var sourceCodes = this._boundUISourceCodes;
-        this._boundUISourceCodes = [];
-        sourceCodes.forEach(this._unbindUISourceCode.bind(this));
+        for (var uiSourceCode of this._boundUISourceCodes.valuesArray())
+            this._unbindUISourceCode(uiSourceCode);
+        this._boundUISourceCodes.clear();
         console.assert(!this._uiSourceCodeToScriptFile.size);
     },
 
     dispose: function()
     {
         WebInspector.EventTarget.removeEventListeners(this._eventListeners);
         this._debuggerReset();
     }
 }
 
@@ skipping 195 matching lines @@
     /**
      * @return {boolean}
      */
     hasSourceMapURL: function()
     {
         return this._script && !!this._script.sourceMapURL;
     },
 
     __proto__: WebInspector.Object.prototype
 }