Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(736)

Unified Diff: third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js

Issue 1564113003: DevTools: merge uisourcecode's url-alike members. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments addressed Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js b/third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js
index 9c77fe49f62232b9d99d13a4ee77817abf6665fd..43ed0f5b3789403cc21c14066da1175e43cca2c3 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/EditingLocationHistoryManager.js
@@ -122,7 +122,7 @@ WebInspector.EditingLocationHistoryManager.prototype = {
{
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);
@@ -144,7 +144,7 @@ WebInspector.EditingLocationHistoryEntry = function(sourcesView, editingLocation
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);
@@ -156,7 +156,7 @@ WebInspector.EditingLocationHistoryEntry.prototype = {
*/
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;
},
@@ -180,7 +180,7 @@ WebInspector.EditingLocationHistoryEntry.prototype = {
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);
},
@@ -190,7 +190,7 @@ WebInspector.EditingLocationHistoryEntry.prototype = {
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;

Powered by Google App Engine
This is Rietveld 408576698