DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.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:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 171 matching lines @@
     _addUISourceCode: function(uiSourceCode)
     {
         if (!this.accept(uiSourceCode))
             return;
 
         var isFromSourceMap = uiSourceCode.contentType().isFromSourceMap();
         var path;
         if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem)
             path = WebInspector.FileSystemWorkspaceBinding.relativePath(uiSourceCode).slice(0, -1);
         else
-            path = WebInspector.ParsedURL.splitURLIntoPathComponents(uiSourceCode.path()).slice(1, -1);
+            path = WebInspector.ParsedURL.splitURLIntoPathComponents(uiSourceCode.url()).slice(1, -1);
 
         var project = uiSourceCode.project();
         var target = WebInspector.NetworkProject.targetForUISourceCode(uiSourceCode);
         var frame = this._uiSourceCodeFrame(uiSourceCode);
 
-        var folderNode = this._folderNode(uiSourceCode, project, target, frame, uiSourceCode.host(), path, isFromSourceMap);
+        var folderNode = this._folderNode(uiSourceCode, project, target, frame, uiSourceCode.origin(), path, isFromSourceMap);
         var uiSourceCodeNode = new WebInspector.NavigatorUISourceCodeTreeNode(this, uiSourceCode);
         this._uiSourceCodeNodes.set(uiSourceCode, uiSourceCodeNode);
         folderNode.appendChild(uiSourceCodeNode);
         this.uiSourceCodeAdded(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     uiSourceCodeAdded: function(uiSourceCode)
@@ skipping 31 matching lines @@
 
         var uiSourceCodes = project.uiSourceCodes();
         for (var i = 0; i < uiSourceCodes.length; ++i)
             this._removeUISourceCode(uiSourceCodes[i]);
     },
 
     /**
      * @param {!WebInspector.Project} project
      * @param {?WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
-     * @param {string} projectHost
+     * @param {string} projectOrigin
      * @param {string} path
      * @return {string}
      */
-    _folderNodeId: function(project, target, frame, projectHost, path)
+    _folderNodeId: function(project, target, frame, projectOrigin, path)
     {
         var targetId = target ? target.id() : "";
         var projectId = project.type() === WebInspector.projectTypes.FileSystem ? project.id() : "";
         var frameId = this._groupByFrame && frame ? frame.id : "";
-        return targetId + ":" + projectId + ":" + frameId + ":" + projectHost + ":" + path;
+        return targetId + ":" + projectId + ":" + frameId + ":" + projectOrigin + ":" + path;
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!WebInspector.Project} project
      * @param {?WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
-     * @param {string} projectHost
+     * @param {string} projectOrigin
      * @param {!Array<string>} path
      * @param {boolean} fromSourceMap
      * @return {!WebInspector.NavigatorTreeNode}
      */
-    _folderNode: function(uiSourceCode, project, target, frame, projectHost, path, fromSourceMap)
+    _folderNode: function(uiSourceCode, project, target, frame, projectOrigin, path, fromSourceMap)
     {
         if (project.type() === WebInspector.projectTypes.Snippets)
             return this._rootNode;
 
         if (target && !this._groupByFolder && !fromSourceMap)
-            return this._domainNode(uiSourceCode, project, target, frame, projectHost);
+            return this._domainNode(uiSourceCode, project, target, frame, projectOrigin);
 
         var folderPath = path.join("/");
-        var folderId = this._folderNodeId(project, target, frame, projectHost, folderPath);
+        var folderId = this._folderNodeId(project, target, frame, projectOrigin, folderPath);
         var folderNode = this._subfolderNodes.get(folderId);
         if (folderNode)
             return folderNode;
 
         if (!path.length) {
             if (target)
-                return this._domainNode(uiSourceCode, project, target, frame, projectHost);
+                return this._domainNode(uiSourceCode, project, target, frame, projectOrigin);
             var fileSystemNode = this._rootNode.child(project.id());
             if (!fileSystemNode) {
                 fileSystemNode = new WebInspector.NavigatorGroupTreeNode(this, project, project.id(),  WebInspector.NavigatorView.Types.FileSystem, project.displayName());
                 this._rootNode.appendChild(fileSystemNode);
             }
             return fileSystemNode;
         }
 
-        var parentNode = this._folderNode(uiSourceCode, project, target, frame, projectHost, path.slice(0, -1), fromSourceMap);
+        var parentNode = this._folderNode(uiSourceCode, project, target, frame, projectOrigin, path.slice(0, -1), fromSourceMap);
         var type = fromSourceMap ? WebInspector.NavigatorView.Types.SourceMapFolder : WebInspector.NavigatorView.Types.NetworkFolder;
         if (project.type() === WebInspector.projectTypes.FileSystem)
             type = WebInspector.NavigatorView.Types.FileSystemFolder;
         var name = path[path.length - 1];
 
         folderNode = new WebInspector.NavigatorFolderTreeNode(this, project, folderId, type, folderPath, name);
         this._subfolderNodes.set(folderId, folderNode);
         parentNode.appendChild(folderNode);
         return folderNode;
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {!WebInspector.Project} project
      * @param {!WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
-     * @param {string} projectHost
+     * @param {string} projectOrigin
      * @return {!WebInspector.NavigatorTreeNode}
      */
-    _domainNode: function(uiSourceCode, project, target, frame, projectHost)
+    _domainNode: function(uiSourceCode, project, target, frame, projectOrigin)
     {
         var frameNode = this._frameNode(project, target, frame);
         if (!this._groupByDomain)
             return frameNode;
-        var domainNode = frameNode.child(projectHost);
+        var domainNode = frameNode.child(projectOrigin);
         if (domainNode)
             return domainNode;
 
-        domainNode = new WebInspector.NavigatorGroupTreeNode(this, project, projectHost,  WebInspector.NavigatorView.Types.Domain, this._computeProjectDisplayName(target, projectHost));
-        if (frame && projectHost === WebInspector.ParsedURL.splitURLIntoPathComponents(frame.url)[0])
+        domainNode = new WebInspector.NavigatorGroupTreeNode(this, project, projectOrigin,  WebInspector.NavigatorView.Types.Domain, this._computeProjectDisplayName(target, projectOrigin));
+        if (frame && projectOrigin === WebInspector.ParsedURL.extractOrigin(frame.url))
             domainNode.treeNode()._boostOrder = true;
         frameNode.appendChild(domainNode);
         return domainNode;
     },
 
     /**
      * @param {!WebInspector.Project} project
      * @param {!WebInspector.Target} target
      * @param {?WebInspector.ResourceTreeFrame} frame
      * @return {!WebInspector.NavigatorTreeNode}
@@ skipping 28 matching lines @@
         var targetNode = this._rootNode.child("target:" + target.id());
         if (!targetNode) {
             targetNode = new WebInspector.NavigatorGroupTreeNode(this, project, "target:" + target.id(), target.isWorker() ? WebInspector.NavigatorView.Types.Worker : WebInspector.NavigatorView.Types.NetworkFolder, target.name());
             this._rootNode.appendChild(targetNode);
         }
         return targetNode;
     },
 
     /**
      * @param {!WebInspector.Target} target
-     * @param {string} projectHost
+     * @param {string} projectOrigin
      * @return {string}
      */
-    _computeProjectDisplayName: function(target, projectHost)
+    _computeProjectDisplayName: function(target, projectOrigin)
     {
         for (var context of target.runtimeModel.executionContexts()) {
-            if (context.name && context.origin && projectHost.startsWith(context.origin))
+            if (context.name && context.origin && projectOrigin.startsWith(context.origin))
                 return context.name;
         }
 
-        if (!projectHost)
+        if (!projectOrigin)
             return WebInspector.UIString("(no domain)");
 
-        var parsedURL = new WebInspector.ParsedURL(projectHost);
+        var parsedURL = new WebInspector.ParsedURL(projectOrigin);
         var prettyURL = parsedURL.isValid ? parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "") : "";
 
-        return (prettyURL || projectHost);
+        return (prettyURL || projectOrigin);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {boolean=} select
      */
     revealUISourceCode: function(uiSourceCode, select)
     {
         var node = this._uiSourceCodeNodes.get(uiSourceCode);
         if (!node)
@@ skipping 38 matching lines @@
         var parentNode = node.parent;
         this._uiSourceCodeNodes.delete(uiSourceCode);
         parentNode.removeChild(node);
         node = parentNode;
 
         while (node) {
             parentNode = node.parent;
             if (!parentNode || !node.isEmpty() || !(node instanceof WebInspector.NavigatorFolderTreeNode))
                 break;
 
-            var folderId = this._folderNodeId(project, target, frame, uiSourceCode.host(), node._folderPath);
+            var folderId = this._folderNodeId(project, target, frame, uiSourceCode.origin(), node._folderPath);
             this._subfolderNodes.delete(folderId);
             parentNode.removeChild(node);
             node = parentNode;
         }
     },
 
     reset: function()
     {
         var nodes = this._uiSourceCodeNodes.valuesArray();
         for (var i = 0; i < nodes.length; ++i)
@@ skipping 57 matching lines @@
         }
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _handleContextMenuDelete: function(uiSourceCode)
     {
         var shouldDelete = window.confirm(WebInspector.UIString("Are you sure you want to delete this file?"));
         if (shouldDelete)
-            uiSourceCode.project().deleteFile(uiSourceCode.path());
+            uiSourceCode.project().deleteFile(uiSourceCode.url());
     },
 
     /**
      * @param {!Event} event
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     handleFileContextMenu: function(event, uiSourceCode)
     {
         var contextMenu = new WebInspector.ContextMenu(event);
         contextMenu.appendApplicableItems(uiSourceCode);
         contextMenu.appendSeparator();
 
         var project = uiSourceCode.project();
         if (project.type() === WebInspector.projectTypes.FileSystem) {
-            var path = uiSourceCode.parentPath();
+            var parentURL = uiSourceCode.parentURL();
             contextMenu.appendItem(WebInspector.UIString.capitalize("Rename\u2026"), this._handleContextMenuRename.bind(this, uiSourceCode));
-            contextMenu.appendItem(WebInspector.UIString.capitalize("Make a ^copy\u2026"), this._handleContextMenuCreate.bind(this, project, path, uiSourceCode));
+            contextMenu.appendItem(WebInspector.UIString.capitalize("Make a ^copy\u2026"), this._handleContextMenuCreate.bind(this, project, parentURL, uiSourceCode));
             contextMenu.appendItem(WebInspector.UIString.capitalize("Delete"), this._handleContextMenuDelete.bind(this, uiSourceCode));
             contextMenu.appendSeparator();
         }
 
         contextMenu.show();
     },
 
     /**
      * @param {!Event} event
      * @param {!WebInspector.NavigatorFolderTreeNode} node
@@ skipping 272 matching lines @@
  * @param {!WebInspector.NavigatorView} navigatorView
  * @param {!WebInspector.UISourceCode} uiSourceCode
  * @param {string} title
  */
 WebInspector.NavigatorSourceTreeElement = function(navigatorView, uiSourceCode, title)
 {
     TreeElement.call(this, "", false);
     this._nodeType = WebInspector.NavigatorView.Types.File;
     this.title = title;
     this.listItemElement.classList.add("navigator-" + uiSourceCode.contentType().name() + "-tree-item", "navigator-file-tree-item");
-    this.tooltip = uiSourceCode.originURL();
+    this.tooltip = uiSourceCode.url();
     this.createIcon();
 
 
     this._navigatorView = navigatorView;
     this._uiSourceCode = uiSourceCode;
 }
 
 WebInspector.NavigatorSourceTreeElement.prototype = {
     /**
      * @return {!WebInspector.UISourceCode}
@@ skipping 292 matching lines @@
 }
 
 /**
  * @constructor
  * @extends {WebInspector.NavigatorTreeNode}
  * @param {!WebInspector.NavigatorView} navigatorView
  * @param {!WebInspector.UISourceCode} uiSourceCode
  */
 WebInspector.NavigatorUISourceCodeTreeNode = function(navigatorView, uiSourceCode)
 {
-    WebInspector.NavigatorTreeNode.call(this, uiSourceCode.project().id() + ":" + uiSourceCode.path(), WebInspector.NavigatorView.Types.File);
+    WebInspector.NavigatorTreeNode.call(this, uiSourceCode.project().id() + ":" + uiSourceCode.url(), WebInspector.NavigatorView.Types.File);
     this._navigatorView = navigatorView;
     this._uiSourceCode = uiSourceCode;
     this._treeElement = null;
 }
 
 WebInspector.NavigatorUISourceCodeTreeNode.prototype = {
     /**
      * @return {!WebInspector.UISourceCode}
      */
     uiSourceCode: function()
@@ skipping 26 matching lines @@
     updateTitle: function(ignoreIsDirty)
     {
         if (!this._treeElement)
             return;
 
         var titleText = this._uiSourceCode.displayName();
         if (!ignoreIsDirty && (this._uiSourceCode.isDirty() || this._uiSourceCode.hasUnsavedCommittedChanges()))
             titleText = "*" + titleText;
         this._treeElement.title = titleText;
 
-        var tooltip = this._uiSourceCode.originURL();
+        var tooltip = this._uiSourceCode.url();
         if (this._uiSourceCode.contentType().isFromSourceMap())
             tooltip = WebInspector.UIString("%s (from source map)", this._uiSourceCode.displayName());
         this._treeElement.tooltip = tooltip;
     },
 
     /**
      * @override
      * @return {boolean}
      */
     hasChildren: function()
@@ skipping 275 matching lines @@
     {
         if (this._treeElement)
             return this._treeElement;
         this._treeElement = new WebInspector.NavigatorFolderTreeElement(this._navigatorView, this._type, this._title);
         this._treeElement.setNode(this);
         return this._treeElement;
     },
 
     __proto__: WebInspector.NavigatorTreeNode.prototype
 }