[webkit-changes] [138160] trunk/Source/WebCore

Wed, 19 Dec 2012 07:28:03 -0800

Title: [138160] trunk/Source/WebCore
Revision
138160
Author
vse...@chromium.org
Date
2012-12-19 07:29:46 -0800 (Wed, 19 Dec 2012)

Log Message

Web Inspector: Rename workspace path to uri.
https://bugs.webkit.org/show_bug.cgi?id=105433

Reviewed by Pavel Feldman.

URI should later become file unique id / address in workspace.

* inspector/front-end/NetworkWorkspaceProvider.js:
(WebInspector.NetworkWorkspaceProvider.prototype.requestFileContent):
(WebInspector.NetworkWorkspaceProvider.prototype.setFileContent):
(WebInspector.NetworkWorkspaceProvider.prototype.searchInFileContent):
(WebInspector.NetworkWorkspaceProvider.prototype.addFile):
(WebInspector.NetworkWorkspaceProvider.prototype.removeFile):
* inspector/front-end/Workspace.js:
(WebInspector.FileDescriptor):
(WebInspector.WorkspaceProvider.prototype.requestFileContent):
(WebInspector.WorkspaceProvider.prototype.searchInFileContent):
(WebInspector.Project.prototype._fileAdded):
(WebInspector.Project.prototype._fileRemoved):
(WebInspector.Project.prototype.requestFileContent):
(WebInspector.Project.prototype.searchInFileContent):
(WebInspector.Workspace.prototype.addTemporaryUISourceCode):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (138159 => 138160)


--- trunk/Source/WebCore/ChangeLog	2012-12-19 15:28:17 UTC (rev 138159)
+++ trunk/Source/WebCore/ChangeLog	2012-12-19 15:29:46 UTC (rev 138160)
@@ -1,3 +1,28 @@
+2012-12-19  Vsevolod Vlasov  <vse...@chromium.org>
+
+        Web Inspector: Rename workspace path to uri.
+        https://bugs.webkit.org/show_bug.cgi?id=105433
+
+        Reviewed by Pavel Feldman.
+
+        URI should later become file unique id / address in workspace.
+
+        * inspector/front-end/NetworkWorkspaceProvider.js:
+        (WebInspector.NetworkWorkspaceProvider.prototype.requestFileContent):
+        (WebInspector.NetworkWorkspaceProvider.prototype.setFileContent):
+        (WebInspector.NetworkWorkspaceProvider.prototype.searchInFileContent):
+        (WebInspector.NetworkWorkspaceProvider.prototype.addFile):
+        (WebInspector.NetworkWorkspaceProvider.prototype.removeFile):
+        * inspector/front-end/Workspace.js:
+        (WebInspector.FileDescriptor):
+        (WebInspector.WorkspaceProvider.prototype.requestFileContent):
+        (WebInspector.WorkspaceProvider.prototype.searchInFileContent):
+        (WebInspector.Project.prototype._fileAdded):
+        (WebInspector.Project.prototype._fileRemoved):
+        (WebInspector.Project.prototype.requestFileContent):
+        (WebInspector.Project.prototype.searchInFileContent):
+        (WebInspector.Workspace.prototype.addTemporaryUISourceCode):
+
 2012-12-14  Alexander Pavlov  <apav...@chromium.org>
 
         Web Inspector: Refactor CSS[Keyword]Completions to augment property metadata

Modified: trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js (138159 => 138160)


--- trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js	2012-12-19 15:28:17 UTC (rev 138159)
+++ trunk/Source/WebCore/inspector/front-end/NetworkWorkspaceProvider.js	2012-12-19 15:29:46 UTC (rev 138160)
@@ -41,21 +41,21 @@
 
 WebInspector.NetworkWorkspaceProvider.prototype = {
     /**
-     * @param {string} path
+     * @param {string} uri
      * @param {function(?string,boolean,string)} callback
      */
-    requestFileContent: function(path, callback)
+    requestFileContent: function(uri, callback)
     {
-        var contentProvider = this._contentProviders[path];
+        var contentProvider = this._contentProviders[uri];
         contentProvider.requestContent(callback);
     },
 
     /**
-     * @param {string} path
+     * @param {string} uri
      * @param {string} newContent
      * @param {function(?string)} callback
      */
-    setFileContent: function(path, newContent, callback)
+    setFileContent: function(uri, newContent, callback)
     {
         callback(null);
     },
@@ -66,33 +66,33 @@
      * @param {boolean} isRegex
      * @param {function(Array.<WebInspector.ContentProvider.SearchMatch>)} callback
      */
-    searchInFileContent: function(path, query, caseSensitive, isRegex, callback)
+    searchInFileContent: function(uri, query, caseSensitive, isRegex, callback)
     {
-        var contentProvider = this._contentProviders[path];
+        var contentProvider = this._contentProviders[uri];
         contentProvider.searchInContent(query, caseSensitive, isRegex, callback);
     },
 
     /**
-     * @param {string} path
+     * @param {string} uri
      * @param {WebInspector.ContentProvider} contentProvider
      * @param {boolean} isEditable
      * @param {boolean=} isContentScript
      * @param {boolean=} isSnippet
      */
-    addFile: function(path, contentProvider, isEditable, isContentScript, isSnippet)
+    addFile: function(uri, contentProvider, isEditable, isContentScript, isSnippet)
     {
-        var fileDescriptor = new WebInspector.FileDescriptor(path, contentProvider.contentType(), isEditable, isContentScript, isSnippet);
-        this._contentProviders[path] = contentProvider;
+        var fileDescriptor = new WebInspector.FileDescriptor(uri, contentProvider.contentType(), isEditable, isContentScript, isSnippet);
+        this._contentProviders[uri] = contentProvider;
         this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileAdded, fileDescriptor);
     },
 
     /**
-     * @param {string} path
+     * @param {string} uri
      */
-    removeFile: function(path)
+    removeFile: function(uri)
     {
-        delete this._contentProviders[path];
-        this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileRemoved, path);
+        delete this._contentProviders[uri];
+        this.dispatchEventToListeners(WebInspector.WorkspaceProvider.Events.FileRemoved, uri);
     },
 
     reset: function()

Modified: trunk/Source/WebCore/inspector/front-end/Workspace.js (138159 => 138160)


--- trunk/Source/WebCore/inspector/front-end/Workspace.js	2012-12-19 15:28:17 UTC (rev 138159)
+++ trunk/Source/WebCore/inspector/front-end/Workspace.js	2012-12-19 15:29:46 UTC (rev 138160)
@@ -58,15 +58,15 @@
 
 /**
  * @constructor
- * @param {string} path
+ * @param {string} uri
  * @param {WebInspector.ResourceType} contentType
  * @param {boolean} isEditable
  * @param {boolean=} isContentScript
  * @param {boolean=} isSnippet
  */
-WebInspector.FileDescriptor = function(path, contentType, isEditable, isContentScript, isSnippet)
+WebInspector.FileDescriptor = function(uri, contentType, isEditable, isContentScript, isSnippet)
 {
-    this.path = path;
+    this.uri = uri;
     this.contentType = contentType;
     this.isEditable = isEditable;
     this.isContentScript = isContentScript || false;
@@ -85,10 +85,10 @@
 
 WebInspector.WorkspaceProvider.prototype = {
     /**
-     * @param {string} path
+     * @param {string} uri
      * @param {function(?string,boolean,string)} callback
      */
-    requestFileContent: function(path, callback) { },
+    requestFileContent: function(uri, callback) { },
 
     /**
      * @param {string} query
@@ -96,7 +96,7 @@
      * @param {boolean} isRegex
      * @param {function(Array.<WebInspector.ContentProvider.SearchMatch>)} callback
      */
-    searchInFileContent: function(path, query, caseSensitive, isRegex, callback) { },
+    searchInFileContent: function(uri, query, caseSensitive, isRegex, callback) { },
 
     /**
      * @param {string} eventType
@@ -142,12 +142,12 @@
     _fileAdded: function(event)
     {
         var fileDescriptor = /** @type {WebInspector.FileDescriptor} */ (event.data);
-        var uiSourceCode = this.uiSourceCodeForURL(fileDescriptor.path);
+        var uiSourceCode = this.uiSourceCodeForURL(fileDescriptor.uri);
         if (uiSourceCode) {
             // FIXME: Implement
             return;
         }
-        uiSourceCode = new WebInspector.UISourceCode(this._workspace, fileDescriptor.path, fileDescriptor.contentType, fileDescriptor.isEditable);
+        uiSourceCode = new WebInspector.UISourceCode(this._workspace, fileDescriptor.uri, fileDescriptor.contentType, fileDescriptor.isEditable);
         uiSourceCode.isContentScript = fileDescriptor.isContentScript;
         uiSourceCode.isSnippet = fileDescriptor.isSnippet;
         this._uiSourceCodes.push(uiSourceCode);
@@ -156,8 +156,8 @@
 
     _fileRemoved: function(event)
     {
-        var path = /** @type {string} */ (event.data);
-        var uiSourceCode = this.uiSourceCodeForURL(path);
+        var uri = /** @type {string} */ (event.data);
+        var uiSourceCode = this.uiSourceCodeForURL(uri);
         if (!uiSourceCode)
             return;
         this._uiSourceCodes.splice(this._uiSourceCodes.indexOf(uiSourceCode), 1);
@@ -186,12 +186,12 @@
     },
 
     /**
-     * @param {string} path
+     * @param {string} uri
      * @param {function(?string,boolean,string)} callback
      */
-    requestFileContent: function(path, callback)
+    requestFileContent: function(uri, callback)
     {
-        this._workspaceProvider.requestFileContent(path, callback);
+        this._workspaceProvider.requestFileContent(uri, callback);
     },
 
     /**
@@ -200,9 +200,9 @@
      * @param {boolean} isRegex
      * @param {function(Array.<WebInspector.ContentProvider.SearchMatch>)} callback
      */
-    searchInFileContent: function(path, query, caseSensitive, isRegex, callback)
+    searchInFileContent: function(uri, query, caseSensitive, isRegex, callback)
     {
-        this._workspaceProvider.searchInFileContent(path, query, caseSensitive, isRegex, callback);
+        this._workspaceProvider.searchInFileContent(uri, query, caseSensitive, isRegex, callback);
     }
 }
 
@@ -260,15 +260,15 @@
     },
 
     /**
-     * @param {string} path
+     * @param {string} uri
      * @param {WebInspector.ContentProvider} contentProvider
      * @param {boolean} isEditable
      * @param {boolean=} isContentScript
      * @param {boolean=} isSnippet
      */
-    addTemporaryUISourceCode: function(path, contentProvider, isEditable, isContentScript, isSnippet)
+    addTemporaryUISourceCode: function(uri, contentProvider, isEditable, isContentScript, isSnippet)
     {
-        var uiSourceCode = new WebInspector.UISourceCode(this, path, contentProvider.contentType(), isEditable);
+        var uiSourceCode = new WebInspector.UISourceCode(this, uri, contentProvider.contentType(), isEditable);
         this._temporaryContentProviders.put(uiSourceCode, contentProvider);
         uiSourceCode.isContentScript = isContentScript;
         uiSourceCode.isSnippet = isSnippet;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to