DevTools: merge uisourcecode's url-alike members.

third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js

 /*
  * Copyright (C) 2014 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 104 matching lines @@
         this._historyManager.push(entry);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     removeHistoryForSourceCode: function(uiSourceCode)
     {
         function filterOut(entry)
         {
-            return entry._projectId === uiSourceCode.project().id() && entry._path === uiSourceCode.path();
+            return entry._projectId === uiSourceCode.project().id() && entry._url === uiSourceCode.url();
         }
 
         this._historyManager.filterOut(filterOut);
     },
 }
 
 
 /**
  * @constructor
  * @implements {WebInspector.HistoryEntry}
  * @param {!WebInspector.SourcesView} sourcesView
  * @param {!WebInspector.EditingLocationHistoryManager} editingLocationManager
  * @param {!WebInspector.SourceFrame} sourceFrame
  * @param {!WebInspector.TextRange} selection
  */
 WebInspector.EditingLocationHistoryEntry = function(sourcesView, editingLocationManager, sourceFrame, selection)
 {
     this._sourcesView = sourcesView;
     this._editingLocationManager = editingLocationManager;
     var uiSourceCode = sourceFrame.uiSourceCode();
     this._projectId = uiSourceCode.project().id();
-    this._path = uiSourceCode.path();
+    this._url = uiSourceCode.url();
 
     var position = this._positionFromSelection(selection);
     this._positionHandle = sourceFrame.textEditor.textEditorPositionHandle(position.lineNumber, position.columnNumber);
 }
 
 WebInspector.EditingLocationHistoryEntry.prototype = {
     /**
      * @param {!WebInspector.HistoryEntry} entry
      */
     merge: function(entry)
     {
-        if (this._projectId !== entry._projectId || this._path !== entry._path)
+        if (this._projectId !== entry._projectId || this._url !== entry._url)
             return;
         this._positionHandle = entry._positionHandle;
     },
 
     /**
      * @param {!WebInspector.TextRange} selection
      * @return {!{lineNumber: number, columnNumber: number}}
      */
     _positionFromSelection: function(selection)
     {
         return {
             lineNumber: selection.endLine,
             columnNumber: selection.endColumn
         };
     },
 
     /**
      * @override
      * @return {boolean}
      */
     valid: function()
     {
         var position = this._positionHandle.resolve();
-        var uiSourceCode = WebInspector.workspace.project(this._projectId).uiSourceCode(this._path);
+        var uiSourceCode = WebInspector.workspace.uiSourceCode(this._projectId, this._url);
         return !!(position && uiSourceCode);
     },
 
     /**
      * @override
      */
     reveal: function()
     {
         var position = this._positionHandle.resolve();
-        var uiSourceCode = WebInspector.workspace.project(this._projectId).uiSourceCode(this._path);
+        var uiSourceCode = WebInspector.workspace.uiSourceCode(this._projectId, this._url);
         if (!position || !uiSourceCode)
             return;
 
         this._editingLocationManager.updateCurrentState();
         this._sourcesView.showSourceLocation(uiSourceCode, position.lineNumber, position.columnNumber);
     }
 }