Diff
Modified: trunk/LayoutTests/ChangeLog (143173 => 143174)
--- trunk/LayoutTests/ChangeLog 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/LayoutTests/ChangeLog 2013-02-18 09:30:22 UTC (rev 143174)
@@ -1,3 +1,16 @@
+2013-02-18 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r143100.
+ http://trac.webkit.org/changeset/143100
+ https://bugs.webkit.org/show_bug.cgi?id=110088
+
+ Breaks file system support in workspace. (Requested by vsevik
+ on #webkit).
+
+ * inspector/debugger/live-edit-breakpoints-expected.txt:
+ * inspector/debugger/live-edit-breakpoints.html:
+ * inspector/uisourcecode-revisions.html:
+
2013-02-18 Zan Dobersek <zdober...@igalia.com>
Unreviewed gardening.
Modified: trunk/LayoutTests/inspector/debugger/live-edit-breakpoints-expected.txt (143173 => 143174)
--- trunk/LayoutTests/inspector/debugger/live-edit-breakpoints-expected.txt 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/LayoutTests/inspector/debugger/live-edit-breakpoints-expected.txt 2013-02-18 09:30:22 UTC (rev 143174)
@@ -9,7 +9,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Editing source:
TextEditor.removeBreakpoint(lineNumber = 2)
TextEditor.addBreakpoint(lineNumber = 2, disabled = true)
@@ -17,7 +17,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Undoing source editing:
OriginalTextEditor.removeBreakpoint(lineNumber = 2)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -26,7 +26,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Finally removing breakpoint:
TextEditor.removeBreakpoint(lineNumber = 2)
Dumping breakpoint storage
@@ -38,7 +38,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Editing source:
OriginalTextEditor.addBreakpoint(lineNumber = 2, disabled = false)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -46,7 +46,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Committing edited source:
OriginalTextEditor.removeBreakpoint(lineNumber = 2)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -55,7 +55,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Finally removing breakpoint:
TextEditor.removeBreakpoint(lineNumber = 2)
Dumping breakpoint storage
@@ -67,7 +67,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Editing source:
OriginalTextEditor.addBreakpoint(lineNumber = 2, disabled = false)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -75,17 +75,17 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Committing edited source:
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Editing source again so that live edit could succeed:
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Committing edited source again:
OriginalTextEditor.removeBreakpoint(lineNumber = 2)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -94,7 +94,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Finally removing breakpoint:
TextEditor.removeBreakpoint(lineNumber = 2)
Dumping breakpoint storage
@@ -106,7 +106,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Editing source:
OriginalTextEditor.addBreakpoint(lineNumber = 2, disabled = false)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -114,17 +114,17 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Committing edited source:
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Undoing source editing:
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: debugger, project id: debugger:file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: debugger
Committing edited source again:
OriginalTextEditor.removeBreakpoint(lineNumber = 2)
TextEditor.removeBreakpoint(lineNumber = 2)
@@ -133,7 +133,7 @@
Dumping breakpoint storage
edit-me-breakpoints.js:2, enabled:true
Dumping breakpoint locations
- url: edit-me-breakpoints.js, lineNumber: 2, project type: network, project id: file://
+ url: edit-me-breakpoints.js, lineNumber: 2, project name: network
Finally removing breakpoint:
TextEditor.removeBreakpoint(lineNumber = 2)
Dumping breakpoint storage
@@ -148,15 +148,15 @@
TextEditor.addBreakpoint(lineNumber = 2, disabled = false)
Dumping breakpoint storage
Dumping breakpoint locations
- url: , lineNumber: 2, project type: debugger, project id: debugger:
+ url: , lineNumber: 2, project name: debugger
Editing source:
Dumping breakpoint storage
Dumping breakpoint locations
- url: , lineNumber: 2, project type: debugger, project id: debugger:
+ url: , lineNumber: 2, project name: debugger
Undoing source editing:
Dumping breakpoint storage
Dumping breakpoint locations
- url: , lineNumber: 2, project type: debugger, project id: debugger:
+ url: , lineNumber: 2, project name: debugger
Finally removing breakpoint:
TextEditor.removeBreakpoint(lineNumber = 2)
Dumping breakpoint storage
@@ -171,15 +171,15 @@
TextEditor.addBreakpoint(lineNumber = 2, disabled = false)
Dumping breakpoint storage
Dumping breakpoint locations
- url: , lineNumber: 2, project type: debugger, project id: debugger:
+ url: , lineNumber: 2, project name: debugger
Editing source:
Dumping breakpoint storage
Dumping breakpoint locations
- url: , lineNumber: 2, project type: debugger, project id: debugger:
+ url: , lineNumber: 2, project name: debugger
Undoing source editing:
Dumping breakpoint storage
Dumping breakpoint locations
- url: , lineNumber: 2, project type: debugger, project id: debugger:
+ url: , lineNumber: 2, project name: debugger
Finally removing breakpoint:
TextEditor.removeBreakpoint(lineNumber = 2)
Dumping breakpoint storage
Modified: trunk/LayoutTests/inspector/debugger/live-edit-breakpoints.html (143173 => 143174)
--- trunk/LayoutTests/inspector/debugger/live-edit-breakpoints.html 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/LayoutTests/inspector/debugger/live-edit-breakpoints.html 2013-02-18 09:30:22 UTC (rev 143174)
@@ -39,8 +39,8 @@
for (var i = 0; i < locations.length; ++i) {
var uiLocation = locations[i].uiLocation;
var uiSourceCode = uiLocation.uiSourceCode;
- var project = uiSourceCode.project();
- InspectorTest.addResult(" url: " + pathToFileName(uiSourceCode.originURL()) + ", lineNumber: " + uiLocation.lineNumber + ", project type: " + project.type() + ", project id: " + project.id());
+ var project = WebInspector.workspace.projectForUISourceCode(uiSourceCode);
+ InspectorTest.addResult(" url: " + pathToFileName(uiSourceCode.originURL()) + ", lineNumber: " + uiLocation.lineNumber + ", project name: " + project.id());
}
}
Modified: trunk/LayoutTests/inspector/uisourcecode-revisions.html (143173 => 143174)
--- trunk/LayoutTests/inspector/uisourcecode-revisions.html 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/LayoutTests/inspector/uisourcecode-revisions.html 2013-02-18 09:30:22 UTC (rev 143174)
@@ -9,7 +9,7 @@
function createMockProject()
{
var workspace = new WebInspector.Workspace();
- var projectDelegate = new WebInspector.SimpleProjectDelegate("", WebInspector.projectTypes.Network);
+ var projectDelegate = new WebInspector.SimpleProjectDelegate(WebInspector.projectTypes.Network);
var project = workspace.addProject(projectDelegate);
project.requestFileContent = function(uri, callback)
{
Modified: trunk/Source/WebCore/ChangeLog (143173 => 143174)
--- trunk/Source/WebCore/ChangeLog 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/Source/WebCore/ChangeLog 2013-02-18 09:30:22 UTC (rev 143174)
@@ -1,3 +1,32 @@
+2013-02-18 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r143100.
+ http://trac.webkit.org/changeset/143100
+ https://bugs.webkit.org/show_bug.cgi?id=110088
+
+ Breaks file system support in workspace. (Requested by vsevik
+ on #webkit).
+
+ * inspector/front-end/ScriptSnippetModel.js:
+ (WebInspector.ScriptSnippetModel.prototype._addScriptSnippet):
+ * inspector/front-end/SimpleWorkspaceProvider.js:
+ (WebInspector.SimpleProjectDelegate):
+ (WebInspector.SimpleProjectDelegate.prototype.id):
+ (WebInspector.SimpleProjectDelegate.prototype.displayName):
+ (WebInspector.SimpleProjectDelegate.prototype.addFile):
+ (WebInspector.SimpleWorkspaceProvider):
+ (WebInspector.SimpleWorkspaceProvider.uriForURL):
+ (WebInspector.SimpleWorkspaceProvider.prototype._innerAddFileForURL):
+ (WebInspector.SimpleWorkspaceProvider.prototype.removeFile):
+ (WebInspector.SimpleWorkspaceProvider.prototype.reset):
+ * inspector/front-end/UISourceCode.js:
+ (WebInspector.UISourceCode.prototype.uri):
+ * inspector/front-end/Workspace.js:
+ (WebInspector.Project.prototype._fileAdded):
+ (WebInspector.Project.prototype._fileRemoved):
+ (WebInspector.Project.prototype.uiSourceCodeForURI):
+ (WebInspector.Workspace.prototype.projectForUISourceCode):
+
2013-02-15 Eugene Klyuchnikov <eus...@chromium.org>
Web Inspector: Introduce ProfilesPanelDescriptor.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js (143173 => 143174)
--- trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/Source/WebCore/inspector/front-end/ScriptSnippetModel.js 2013-02-18 09:30:22 UTC (rev 143174)
@@ -82,7 +82,7 @@
*/
_addScriptSnippet: function(snippet)
{
- var uiSourceCode = this._workspaceProvider.addFileByName("", snippet.name, new WebInspector.SnippetContentProvider(snippet), true);
+ var uiSourceCode = this._workspaceProvider.addFileForURL(snippet.name, new WebInspector.SnippetContentProvider(snippet), true);
var scriptFile = new WebInspector.SnippetScriptFile(this, uiSourceCode);
uiSourceCode.setScriptFile(scriptFile);
this._snippetIdForUISourceCode.put(uiSourceCode, snippet.id);
@@ -103,7 +103,7 @@
this._releaseSnippetScript(uiSourceCode);
delete this._uiSourceCodeForSnippetId[snippet.id];
this._snippetIdForUISourceCode.remove(uiSourceCode);
- this._workspaceProvider.removeFileByName("", snippet.name);
+ this._workspaceProvider.removeFile(snippet.name);
},
/**
Modified: trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js (143173 => 143174)
--- trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/Source/WebCore/inspector/front-end/SimpleWorkspaceProvider.js 2013-02-18 09:30:22 UTC (rev 143174)
@@ -33,28 +33,21 @@
* @implements {WebInspector.ProjectDelegate}
* @extends {WebInspector.Object}
*/
-WebInspector.SimpleProjectDelegate = function(name, type)
+WebInspector.SimpleProjectDelegate = function(type)
{
- this._name = name;
this._type = type;
/** @type {Object.<string, WebInspector.ContentProvider>} */
this._contentProviders = {};
this._lastUniqueSuffix = 0;
}
-WebInspector.SimpleProjectDelegate.projectId = function(name, type)
-{
- var typePrefix = type !== WebInspector.projectTypes.Network ? (type + ":") : "";
- return typePrefix + name;
-}
-
WebInspector.SimpleProjectDelegate.prototype = {
/**
* @return {string}
*/
id: function()
{
- return WebInspector.SimpleProjectDelegate.projectId(this._name, this._type);
+ return this._type;
},
/**
@@ -70,18 +63,7 @@
*/
displayName: function()
{
- if (typeof this._displayName !== "undefined")
- return this._displayName;
- if (!this._name) {
- this._displayName = "";
- return this._displayName;
- }
- var parsedURL = new WebInspector.ParsedURL(this._name);
- if (parsedURL.isValid)
- this._displayName = parsedURL.host + (parsedURL.port ? (":" + parsedURL.port) : "");
- else
- this._displayName = this._name;
- return this._displayName;
+ return "";
},
/**
@@ -105,7 +87,6 @@
},
/**
- * @param {string} path
* @param {string} query
* @param {boolean} caseSensitive
* @param {boolean} isRegex
@@ -123,12 +104,12 @@
* @param {WebInspector.ContentProvider} contentProvider
* @param {boolean} isEditable
* @param {boolean=} isContentScript
- * @return {string}
*/
addFile: function(path, forceUniquePath, url, contentProvider, isEditable, isContentScript)
{
if (forceUniquePath)
path = this._uniquePath(path);
+ console.assert(!this._contentProviders[path]);
var fileDescriptor = new WebInspector.FileDescriptor(path, url, url, contentProvider.contentType(), isEditable, isContentScript);
this._contentProviders[path] = contentProvider;
this.dispatchEventToListeners(WebInspector.ProjectDelegate.Events.FileAdded, fileDescriptor);
@@ -175,84 +156,27 @@
{
this._workspace = workspace;
this._type = type;
- this._simpleProjectDelegates = {};
+ this._simpleProjectDelegate = new WebInspector.SimpleProjectDelegate(this._type);
+ this._workspace.addProject(this._simpleProjectDelegate);
}
/**
* @param {string} url
- * @return {Array.<string>}
- */
-WebInspector.SimpleWorkspaceProvider.splitURL = function(url)
-{
- var parsedURL = new WebInspector.ParsedURL(url);
- var origin;
- var folderPath;
- var name;
- if (parsedURL.isValid) {
- origin = parsedURL.scheme + "://" + parsedURL.host;
- if (parsedURL.port)
- origin += ":" + parsedURL.port;
- folderPath = parsedURL.folderPathComponents;
- name = parsedURL.lastPathComponent;
- if (parsedURL.queryParams)
- name += "?" + parsedURL.queryParams;
- } else {
- origin = "";
- folderPath = "";
- name = url;
- }
- var result = [origin];
- var splittedPath = folderPath.split("/");
- for (var i = 1; i < splittedPath.length; ++i)
- result.push(splittedPath[i]);
- result.push(name);
- return result;
-}
-
-/**
- * @param {Array.<string>} splittedURL
* @return {string}
*/
-WebInspector.SimpleWorkspaceProvider._pathForSplittedURL = function(splittedURL)
-{
- splittedURL.shift();
- return splittedURL.join("/");
+WebInspector.SimpleWorkspaceProvider.uriForURL = function(url, type)
+{
+ var uriTypePrefix = type !== WebInspector.projectTypes.Network ? (type + ":") : "";
+ var uri = uriTypePrefix + url;
+ return uri;
}
-/**
- * @param {string} url
- * @param {string} type
- * @return {string}
- */
-WebInspector.SimpleWorkspaceProvider.uriForURL = function(url, type)
-{
- var splittedURL = WebInspector.SimpleWorkspaceProvider.splitURL(url);
- var projectId = WebInspector.SimpleProjectDelegate.projectId(splittedURL[0], type);
- var path = WebInspector.SimpleWorkspaceProvider._pathForSplittedURL(splittedURL);
- return WebInspector.UISourceCode.uri(projectId, path);
- }
-
WebInspector.SimpleWorkspaceProvider.prototype = {
/**
- * @param {string} projectName
- * @return {WebInspector.ProjectDelegate}
- */
- _projectDelegate: function(projectName)
- {
- if (this._simpleProjectDelegates[projectName])
- return this._simpleProjectDelegates[projectName];
- var simpleProjectDelegate = new WebInspector.SimpleProjectDelegate(projectName, this._type);
- this._simpleProjectDelegates[projectName] = simpleProjectDelegate;
- this._workspace.addProject(simpleProjectDelegate);
- return simpleProjectDelegate;
- },
-
- /**
* @param {string} url
* @param {WebInspector.ContentProvider} contentProvider
* @param {boolean} isEditable
* @param {boolean=} isContentScript
- * @return {WebInspector.UISourceCode}
*/
addFileForURL: function(url, contentProvider, isEditable, isContentScript)
{
@@ -264,7 +188,6 @@
* @param {WebInspector.ContentProvider} contentProvider
* @param {boolean} isEditable
* @param {boolean=} isContentScript
- * @return {WebInspector.UISourceCode}
*/
addUniqueFileForURL: function(url, contentProvider, isEditable, isContentScript)
{
@@ -275,62 +198,27 @@
* @param {string} url
* @param {WebInspector.ContentProvider} contentProvider
* @param {boolean} isEditable
- * @param {boolean} forceUnique
* @param {boolean=} isContentScript
- * @return {WebInspector.UISourceCode}
*/
_innerAddFileForURL: function(url, contentProvider, isEditable, forceUnique, isContentScript)
{
- var splittedURL = WebInspector.SimpleWorkspaceProvider.splitURL(url);
- var projectName = splittedURL[0];
- var path = WebInspector.SimpleWorkspaceProvider._pathForSplittedURL(splittedURL);
- return this._innerAddFile(projectName, path, url, contentProvider, isEditable, forceUnique, isContentScript);
+ var path = WebInspector.SimpleWorkspaceProvider.uriForURL(url, this._type);
+ path = this._simpleProjectDelegate.addFile(path, forceUnique, url, contentProvider, isEditable, isContentScript);
+ return this._workspace.uiSourceCode(this._simpleProjectDelegate.id(), path);
},
/**
- * @param {string} projectName
- * @param {string} name
- * @param {WebInspector.ContentProvider} contentProvider
- * @param {boolean} isEditable
- * @param {boolean=} isContentScript
- * @return {WebInspector.UISourceCode}
+ * @param {string} url
*/
- addFileByName: function(projectName, name, contentProvider, isEditable, isContentScript)
+ removeFile: function(url)
{
- return this._innerAddFile("", name, name, contentProvider, isEditable, false, isContentScript);
+ var path = WebInspector.SimpleWorkspaceProvider.uriForURL(url, this._type);
+ this._simpleProjectDelegate.removeFile(path);
},
- /**
- * @param {string} projectName
- * @param {string} path
- * @param {WebInspector.ContentProvider} contentProvider
- * @param {boolean} isEditable
- * @param {boolean} forceUnique
- * @param {boolean=} isContentScript
- * @return {WebInspector.UISourceCode}
- */
- _innerAddFile: function(projectName, path, url, contentProvider, isEditable, forceUnique, isContentScript)
- {
- var projectDelegate = this._projectDelegate(projectName);
- path = projectDelegate.addFile(path, forceUnique, url, contentProvider, isEditable, isContentScript);
- return this._workspace.uiSourceCode(projectDelegate.id(), path);
- },
-
- /**
- * @param {string} projectName
- * @param {string} path
- */
- removeFileByName: function(projectName, path)
- {
- var projectDelegate = this._projectDelegate(projectName);
- projectDelegate.removeFile(path);
- },
-
reset: function()
{
- for (var projectName in this._simpleProjectDelegates)
- this._simpleProjectDelegates[projectName].reset();
- this._simpleProjectDelegates = {};
+ this._simpleProjectDelegate.reset();
},
__proto__: WebInspector.Object.prototype
Modified: trunk/Source/WebCore/inspector/front-end/UISourceCode.js (143173 => 143174)
--- trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/Source/WebCore/inspector/front-end/UISourceCode.js 2013-02-18 09:30:22 UTC (rev 143174)
@@ -81,37 +81,6 @@
SourceMappingChanged: "SourceMappingChanged",
}
-/**
- * @param {string} projectId
- * @param {string} path
- * @return {string}
- */
-WebInspector.UISourceCode.uri = function(projectId, path)
-{
- if (!projectId)
- return path;
- if (!path)
- return projectId;
- return projectId + "/" + path;
-}
-
-/**
- * @param {string} projectId
- * @param {string} uri
- * @return {?string}
- */
-WebInspector.UISourceCode.path = function(projectId, uri)
-{
- if (!projectId)
- return uri;
- if (!uri.startsWith(projectId))
- return null;
- var path = uri.substr(projectId.length);
- if (path.length && path[0] === "/")
- path = path.substr(1);
- return path;
-}
-
WebInspector.UISourceCode.prototype = {
/**
* @return {string}
@@ -134,7 +103,7 @@
*/
uri: function()
{
- return WebInspector.UISourceCode.uri(this._project.id(), this._path);
+ return this._path;
},
/**
Modified: trunk/Source/WebCore/inspector/front-end/Workspace.js (143173 => 143174)
--- trunk/Source/WebCore/inspector/front-end/Workspace.js 2013-02-18 09:27:42 UTC (rev 143173)
+++ trunk/Source/WebCore/inspector/front-end/Workspace.js 2013-02-18 09:30:22 UTC (rev 143174)
@@ -187,7 +187,7 @@
_fileAdded: function(event)
{
var fileDescriptor = /** @type {WebInspector.FileDescriptor} */ (event.data);
- var uiSourceCode = this.uiSourceCode(fileDescriptor.path);
+ var uiSourceCode = this.uiSourceCodeForURI(fileDescriptor.path);
if (uiSourceCode) {
// FIXME: Implement
return;
@@ -201,7 +201,7 @@
_fileRemoved: function(event)
{
var path = /** @type {string} */ (event.data);
- var uiSourceCode = this.uiSourceCode(path);
+ var uiSourceCode = this.uiSourceCodeForURI(path);
if (!uiSourceCode)
return;
delete this._uiSourceCodes[uiSourceCode.path()];
@@ -243,10 +243,7 @@
*/
uiSourceCodeForURI: function(uri)
{
- var path = WebInspector.UISourceCode.path(this.id(), uri);
- if (typeof path !== "string")
- return null;
- return this._uiSourceCodes[path];
+ return this.uiSourceCode(uri);
},
/**
@@ -298,6 +295,7 @@
WebInspector.projectTypes = {
Debugger: "debugger",
LiveEdit: "liveedit",
+ Compiler: "compiler",
Network: "network",
Snippets: "snippets",
FileSystem: "filesystem"
@@ -443,6 +441,19 @@
return result;
},
+ /**
+ * @return {?WebInspector.Project}
+ */
+ projectForUISourceCode: function(uiSourceCode)
+ {
+ for (var projectId in this._projects) {
+ var project = this._projects[projectId];
+ if (project.uiSourceCodeForURI(uiSourceCode.uri()))
+ return project;
+ }
+ return null;
+ },
+
__proto__: WebInspector.Object.prototype
}
