Changeset 120472 in webkit

Timestamp:

Jun 15, 2012, 9:57:11 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Add FileSystemRequestManager and FileSystemDispatcher
​https://bugs.webkit.org/show_bug.cgi?id=89191

Patch by Taiju Tsuiki <​tzik@chromium.org> on 2012-06-15
Reviewed by Vsevolod Vlasov.

• inspector/front-end/FileSystemModel.js:

(WebInspector.FileSystemModel):
(WebInspector.FileSystemRequestManager):
(WebInspector.FileSystemRequestManager.prototoype._requestId):
(WebInspector.FileSystemRequestManager.prototoype.readDirectory):
(WebInspector.FileSystemRequestManager.prototoype._didReadDirectory):
(WebInspector.FileSystemDispatcher):
(WebInspector.FileSystemDispatcher.prototype.gotFileSystemRoot):
(WebInspector.FileSystemDispatcher.prototype.didReadDirectory):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/FileSystemModel.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-15  Taiju Tsuiki  <tzik@chromium.org>
+
+        Web Inspector: Add FileSystemRequestManager and FileSystemDispatcher
+        https://bugs.webkit.org/show_bug.cgi?id=89191
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/front-end/FileSystemModel.js:
+        (WebInspector.FileSystemModel):
+        (WebInspector.FileSystemRequestManager):
+        (WebInspector.FileSystemRequestManager.prototoype._requestId):
+        (WebInspector.FileSystemRequestManager.prototoype.readDirectory):
+        (WebInspector.FileSystemRequestManager.prototoype._didReadDirectory):
+        (WebInspector.FileSystemDispatcher):
+        (WebInspector.FileSystemDispatcher.prototype.gotFileSystemRoot):
+        (WebInspector.FileSystemDispatcher.prototype.didReadDirectory):
+
 2012-06-15  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/FileSystemModel.js

@@ -45 +45 @@
     WebInspector.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameDetached, this);
 
-    FileSystemAgent.enable();
+    this._agentWrapper = new WebInspector.FileSystemRequestManager();
 
     if (WebInspector.resourceTreeModel.mainFrame)
@@ -222 +222 @@
     }
 }
+
+/**
+ * @constructor
+ */
+WebInspector.FileSystemRequestManager = function()
+{
+    this._pendingReadDirectoryRequests = {};
+
+    InspectorBackend.registerFileSystemDispatcher(new WebInspector.FileSystemDispatcher(this));
+    FileSystemAgent.enable();
+}
+
+WebInspector.FileSystemRequestManager.nextRequestId = 1;
+
+WebInspector.FileSystemRequestManager.prototype = {
+    /**
+     * @return {number}
+     */
+    _requestId: function()
+    {
+        return WebInspector.FileSystemRequestManager.nextRequestId++;
+    },
+
+    /**
+     * @param {string} url
+     * @param {function(number, Array.<FileSystemAgent.Entry>=)} callback
+     */
+    readDirectory: function(url, callback)
+    {
+        var requestId = this.requestId();
+        this._pendingReadDirectoryRequests[requestId] = callback;
+        FileSystemAgent.readDirectory(requestId, url);
+    },
+
+    /**
+     * @param {number} requestId
+     * @param {number} errorCode
+     * @param {Array.<FileSystemAgent.Entry>=} backendEntries
+     */
+    _didReadDirectory: function(requestId, errorCode, backendEntries)
+    {
+        var callback = /** @type {function(number, Array.<FileSystemAgent.Entry>=)} */ this._pendingReadDirectoryRequests[requestId];
+        if (!callback)
+            return;
+        delete this._pendingReadDirectoryRequests[requestId];
+        callback(errorCode, backendEntries);
+    }
+}
+
+/**
+ * @constructor
+ * @implements {FileSystemAgent.Dispatcher}
+ * @param {WebInspector.FileSystemRequestManager} agentWrapper
+ */
+WebInspector.FileSystemDispatcher = function(agentWrapper)
+{
+    this._agentWrapper = agentWrapper;
+}
+
+WebInspector.FileSystemDispatcher.prototype = {
+    /**
+     * @param {number} requestId
+     * @param {number} errorCode
+     * @param {Array.<FileSystemAgent.Entry>=} backendEntries
+     */
+    didReadDirectory: function(requestId, errorCode, backendEntries)
+    {
+        this._agentWrapper._didReadDirectory(requestId, errorCode, backendEntries);
+    }
+}