DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/bindings/NetworkProject.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 144 matching lines @@
  */
 WebInspector.NetworkProject.uiSourceCodeMimeType = function(uiSourceCode)
 {
     if (uiSourceCode[WebInspector.NetworkProject._scriptSymbol] ||
         uiSourceCode[WebInspector.NetworkProject._styleSheetSymbol]) {
         return uiSourceCode.contentType().canonicalMimeType();
     }
     var resource = uiSourceCode[WebInspector.NetworkProject._resourceSymbol];
     if (resource)
         return resource.mimeType;
-    var mimeType = WebInspector.ResourceType.mimeFromURL(uiSourceCode.originURL());
+    var mimeType = WebInspector.ResourceType.mimeFromURL(uiSourceCode.url());
     return mimeType || uiSourceCode.contentType().canonicalMimeType();
 }
 
 /**
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @return {?WebInspector.ResourceTreeFrame}
  */
 WebInspector.NetworkProject.uiSourceCodeFrame = function(uiSourceCode)
 {
     var target = uiSourceCode[WebInspector.NetworkProject._targetSymbol];
@@ skipping 174 matching lines @@
 
         // Ignore non-images and non-fonts.
         if (resourceType === WebInspector.resourceTypes.Image && resource.mimeType && !resource.mimeType.startsWith("image"))
             return;
         if (resourceType === WebInspector.resourceTypes.Font && resource.mimeType && !resource.mimeType.includes("font"))
             return;
         if ((resourceType === WebInspector.resourceTypes.Image || resourceType === WebInspector.resourceTypes.Font) && resource.contentURL().startsWith("data:"))
             return;
 
         // Never load document twice.
-        if (this._workspace.uiSourceCodeForOriginURL(resource.url))
+        if (this._workspace.uiSourceCodeForURL(resource.url))
             return;
 
         var uiSourceCode = this._createFile(resource.url, resource, WebInspector.ResourceTreeFrame.fromResource(resource), false, false);
         if (uiSourceCode) {
             uiSourceCode[WebInspector.NetworkProject._resourceSymbol] = resource;
             this._addUISourceCodeWithProvider(uiSourceCode, resource);
         }
     },
 
     /**
@@ skipping 30 matching lines @@
     /**
      * @param {string} url
      * @param {!WebInspector.ContentProvider} contentProvider
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @param {boolean} isContentScript
      * @param {boolean} addIntoProject
      * @return {?WebInspector.UISourceCode}
      */
     _createFile: function(url, contentProvider, frame, isContentScript, addIntoProject)
     {
-        if (this._networkMapping.hasMappingForURL(url))
+        if (this._networkMapping.hasMappingForNetworkURL(url))
             return null;
 
         var project = this._workspaceProject(frame, isContentScript);
         var uiSourceCode = project.createUISourceCode(url, contentProvider.contentType());
         uiSourceCode[WebInspector.NetworkProject._targetSymbol] = this.target();
         if (addIntoProject)
             project.addUISourceCodeWithProvider(uiSourceCode, contentProvider);
         return uiSourceCode;
     },
 
@@ skipping 18 matching lines @@
 
     _reset: function()
     {
         for (var project of this._workspaceProjects.values())
             project.reset();
         this._workspaceProjects.clear();
     },
 
     __proto__: WebInspector.SDKObject.prototype
 }