Changeset 116222 in webkit

Timestamp:

May 5, 2012 8:33:10 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: convert standalone functions save/append/savedURL/appendedToURL into WebInspector.FileManager object.
​https://bugs.webkit.org/show_bug.cgi?id=85710

The idea is to have an object and be able to add/remove event listeners from it.

Reviewed by Yury Semikhatsky.

• English.lproj/localizedStrings.js:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• inspector/compile-front-end.py:
• inspector/front-end/FileManager.js: Copied from Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js.

(WebInspector.FileManager):
(WebInspector.FileManager.prototype.canSave):
(WebInspector.FileManager.prototype.canAppend):
(WebInspector.FileManager.prototype.append):
(WebInspector.FileManager.prototype.appendedToURL):

• inspector/front-end/HeapSnapshotView.js:

(WebInspector.HeapProfileHeader.prototype.canSave):
(WebInspector.HeapProfileHeader.prototype.save):

• inspector/front-end/InspectorFrontendHostStub.js:
• inspector/front-end/WebKit.qrc:
• inspector/front-end/inspector.html:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• WebCore.gypi (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• inspector/compile-front-end.py (modified) (1 diff)
• inspector/front-end/FileManager.js (added)
• inspector/front-end/HeapSnapshotView.js (modified) (3 diffs)
• inspector/front-end/InspectorFrontendAPI.js (modified) (1 diff)
• inspector/front-end/InspectorFrontendHostStub.js (modified) (2 diffs)
• inspector/front-end/ProfilesPanel.js (modified) (2 diffs)
• inspector/front-end/TextViewer.js (modified) (1 diff)
• inspector/front-end/TimelineModel.js (modified) (1 diff)
• inspector/front-end/WebKit.qrc (modified) (1 diff)
• inspector/front-end/externs.js (modified) (1 diff)
• inspector/front-end/inspector.html (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-05  Ilya Tikhonovsky  <loislo@chromium.org>
+
+        Web Inspector: convert standalone functions save/append/savedURL/appendedToURL into WebInspector.FileManager object.
+        https://bugs.webkit.org/show_bug.cgi?id=85710
+
+        The idea is to have an object and be able to add/remove event listeners from it.
+
+        Reviewed by Yury Semikhatsky.
+
+        * English.lproj/localizedStrings.js:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * inspector/compile-front-end.py:
+        * inspector/front-end/FileManager.js: Copied from Source/WebCore/inspector/front-end/InspectorFrontendHostStub.js.
+        (WebInspector.FileManager):
+        (WebInspector.FileManager.prototype.canSave):
+        (WebInspector.FileManager.prototype.canAppend):
+        (WebInspector.FileManager.prototype.append):
+        (WebInspector.FileManager.prototype.appendedToURL):
+        * inspector/front-end/HeapSnapshotView.js:
+        (WebInspector.HeapProfileHeader.prototype.canSave):
+        (WebInspector.HeapProfileHeader.prototype.save):
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        * inspector/front-end/WebKit.qrc:
+        * inspector/front-end/inspector.html:
+
 2012-05-05  Zhenyao Mo  <zmo@google.com>
 

trunk/Source/WebCore/WebCore.gypi

@@ -6365 +6365 @@
             'inspector/front-end/ExtensionRegistryStub.js',
             'inspector/front-end/ExtensionServer.js',
+            'inspector/front-end/FileManager.js',
             'inspector/front-end/FilteredItemSelectionDialog.js',
             'inspector/front-end/FontView.js',

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -74234 +74234 @@
                                 </File>
                                 <File
+                                        RelativePath="..\inspector\front-end\FileManager.js"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\inspector\front-end\FilteredItemSelectionDialog.js"
                                         >

trunk/Source/WebCore/inspector/compile-front-end.py

@@ -75 +75 @@
             "DebuggerModel.js",
             "DebuggerPresentationModel.js",
+            "FileManager.js",
             "HAREntry.js",
             "IndexedDBModel.js",

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

@@ -789 +789 @@
 
 WebInspector.HeapProfileHeader.prototype = {
+    /**
+     * @override
+     * @param {Function} callback
+     */
     load: function(callback)
     {
@@ -816 +820 @@
     },
 
-    _saveStatusUpdate: function()
-    {
-        ++this._savedChunksCount;
-        if (this._savedChunksCount === this._totalNumberOfChunks) {
+    /**
+     * @param {WebInspector.Event} event
+     */
+    _saveStatusUpdate: function(event)
+    {
+        if (event.data !== this._fileName)
+            return;
+        if (++this._savedChunksCount === this._totalNumberOfChunks) {
             this.sidebarElement.subtitle = Number.bytesToString(this._proxy.totalSize);
             this.sidebarElement.wait = false;
+            this._savedChunksCount = 0;
+            WebInspector.fileManager.removeEventListener(WebInspector.FileManager.EventTypes.AppendedToURL, this._saveStatusUpdate, this);
         } else
             this.sidebarElement.subtitle = WebInspector.UIString("Saving\u2026 %d\%", Math.floor(this._savedChunksCount * 100 / this._totalNumberOfChunks));
     },
 
+    /**
+     * @param {string} chunk
+     */
     pushJSONChunk: function(chunk)
     {
         if (this._loaded) {
             this.sidebarElement.wait = true;
-            WebInspector.append(this._fileName, chunk, this._saveStatusUpdate.bind(this));
+            WebInspector.fileManager.append(this._fileName, chunk);
         } else {
             ++this._totalNumberOfChunks;
@@ -851 +864 @@
     },
 
+    /**
+     * @override
+     * @return {boolean}
+     */
     canSave: function()
     {
-        return this._loaded && InspectorFrontendHost.canSave() && ("append" in InspectorFrontendHost);
-    },
-
+        return this._loaded && !this._savedChunksCount && WebInspector.fileManager.canAppend();
+    },
+
+    /**
+     * @override
+     */
     save: function()
     {
-        function startWritingSnapshot()
+        /**
+         * @param {WebInspector.Event} event
+         */
+        function startWritingSnapshot(event)
         {
+            if (event.data !== this._fileName)
+                return;
             this.sidebarElement.wait = true;
-            this.sidebarElement.subtitle = WebInspector.UIString("Saving\u2026 0\%");
+            this.sidebarElement.subtitle = WebInspector.UIString("Saving\u2026 %d\%", 0);
             this._savedChunksCount = 0;
+            WebInspector.fileManager.removeEventListener(WebInspector.FileManager.EventTypes.SavedURL, startWritingSnapshot, this);
+            WebInspector.fileManager.addEventListener(WebInspector.FileManager.EventTypes.AppendedToURL, this._saveStatusUpdate, this);
             ProfilerAgent.getProfile(this.typeId, this.uid);
         }
+
         this._fileName = this._fileName || "Heap-" + new Date().toISO8601Compact() + ".json";
-        WebInspector.save(this._fileName, "", true, startWritingSnapshot.bind(this));
+        WebInspector.fileManager.addEventListener(WebInspector.FileManager.EventTypes.SavedURL, startWritingSnapshot, this);
+        WebInspector.fileManager.save(this._fileName, "", true);
     }
 }

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

@@ -108 +108 @@
     savedURL: function(url)
     {
-        WebInspector.savedURL(url);
+        WebInspector.fileManager.savedURL(url);
     },
 
     appendedToURL: function(url)
     {
-        WebInspector.appendedToURL(url);
+        WebInspector.fileManager.appendedToURL(url);
     },
 

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

@@ -138 +138 @@
     },
 
+    canAppend: function()
+    {
+        return false;
+    },
+
+    append: function(url, content)
+    {
+    },
+
     sendMessageToBackend: function(message)
     {
@@ -168 +177 @@
 
 }
+

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

@@ -137 +137 @@
 }
 
+WebInspector.ProfileHeader.prototype = {
+    /**
+     * @param {Function} callback
+     */
+    load: function(callback) { },
+
+    /**
+     * @return {boolean}
+     */
+    canSave: function() { return false; },
+
+    save: function() { throw new Error("Needs implemented"); }
+}
+
 /**
  * @constructor
@@ -1096 +1110 @@
     {
         var profile = this.profile;
-        if (!profile.canSave || !profile.canSave())
+        if (!profile.canSave())
             return;
         var contextMenu = new WebInspector.ContextMenu();

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

@@ -305 +305 @@
 
         this._delegate.commitEditing();
-        if (this._url && WebInspector.isURLSaved(this._url))
-            WebInspector.save(this._url, this._textModel.text, false);
+        if (this._url && WebInspector.fileManager.isURLSaved(this._url))
+            WebInspector.fileManager.save(this._url, this._textModel.text, false);
         return true;
     },

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

@@ -204 +204 @@
         var now = new Date();
         var fileName = "TimelineRawData-" + now.toISO8601Compact() + ".json";
-        WebInspector.save(fileName, records.join(",\n"), true);
+        WebInspector.fileManager.save(fileName, records.join(",\n"), true);
+
     },
 

trunk/Source/WebCore/inspector/front-end/WebKit.qrc

@@ -56 +56 @@
     <file>ExtensionRegistryStub.js</file>
     <file>ExtensionServer.js</file>
+    <file>FileManager.js</file>
     <file>FilteredItemSelectionDialog.js</file>
     <file>FontView.js</file>

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

@@ -157 +157 @@
 WebInspector.evaluateInConsole = function(expression, showResultOnly) {}
 
-WebInspector.isURLSaved = function(url) {}
-
 var InjectedFakeWorker = function() {}
 

trunk/Source/WebCore/inspector/front-end/inspector.html

@@ -48 +48 @@
     <script type="text/javascript" src="Settings.js"></script>
     <script type="text/javascript" src="InspectorFrontendHostStub.js"></script>
+    <script type="text/javascript" src="FileManager.js"></script>
     <script type="text/javascript" src="Checkbox.js"></script>
     <script type="text/javascript" src="ContextMenu.js"></script>

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

@@ -1033 +1033 @@
 }
 
-WebInspector._saveCallbacks = [];
-
-WebInspector.save = function(url, content, forceSaveAs, callback)
-{
-    // Remove this url from the saved URLs while it is being saved.
-    var savedURLs = WebInspector.settings.savedURLs.get();
-    delete savedURLs[url];
-    WebInspector.settings.savedURLs.set(savedURLs);
-    if (callback)
-        WebInspector._saveCallbacks[url] = callback;
-    InspectorFrontendHost.save(url, content, forceSaveAs);
-}
-
-WebInspector.savedURL = function(url)
-{
-    var savedURLs = WebInspector.settings.savedURLs.get();
-    savedURLs[url] = true;
-    WebInspector.settings.savedURLs.set(savedURLs);
-    var callback = WebInspector._saveCallbacks[url];
-    if (!callback)
-        return;
-    delete WebInspector._saveCallbacks[url];
-    callback.call(null, url);
-}
-
-WebInspector.isURLSaved = function(url)
-{
-    var savedURLs = WebInspector.settings.savedURLs.get();
-    return savedURLs[url];
-}
-
-WebInspector._appendCallbacks = [];
-
-WebInspector.append = function(url, content, callback)
-{
-    if (callback)
-        WebInspector._appendCallbacks[url] = callback;
-    InspectorFrontendHost.append(url, content);
-}
-
-WebInspector.appendedToURL = function(url)
-{
-    var callback = WebInspector._appendCallbacks[url];
-    if (callback)
-        callback.call(null, url);
-}
-