Changeset 84358 in webkit

Timestamp:

Apr 20, 2011 5:27:15 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-20 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: add saveAs into the InspectorFrontendHost binding.
​https://bugs.webkit.org/show_bug.cgi?id=58979

• English.lproj/localizedStrings.js:
• inspector/InspectorFrontendClient.h: (WebCore::InspectorFrontendClient::saveAs): (WebCore::InspectorFrontendClient::saveSessionSetting): (WebCore::InspectorFrontendClient::loadSessionSetting):
• inspector/InspectorFrontendHost.cpp: (WebCore::InspectorFrontendHost::saveAs):
• inspector/InspectorFrontendHost.h:
• inspector/InspectorFrontendHost.idl:
• inspector/front-end/InspectorFrontendHostStub.js: (.WebInspector.InspectorFrontendHostStub.prototype.saveAs.fr.onload): (.WebInspector.InspectorFrontendHostStub.prototype.saveAs):
• inspector/front-end/NetworkPanel.js: (WebInspector.NetworkPanel.prototype._contextMenu): (WebInspector.NetworkPanel.prototype._copyAll): (WebInspector.NetworkPanel.prototype._copyResource): (WebInspector.NetworkPanel.prototype._exportAll): (WebInspector.NetworkPanel.prototype._exportResource):
• inspector/front-end/Settings.js:
• inspector/front-end/utilities.js: ():

2011-04-20 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: add saveAs into the InspectorFrontendHost binding.
​https://bugs.webkit.org/show_bug.cgi?id=58979

• public/WebDevToolsFrontendClient.h: (WebKit::WebDevToolsFrontendClient::saveAs):
• src/InspectorFrontendClientImpl.cpp: (WebKit::InspectorFrontendClientImpl::saveAs):
• src/InspectorFrontendClientImpl.h:
• src/js/DevTools.js:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/English.lproj/localizedStrings.js (modified) (previous)
• WebCore/inspector/InspectorFrontendClient.h (modified) (2 diffs)
• WebCore/inspector/InspectorFrontendHost.cpp (modified) (1 diff)
• WebCore/inspector/InspectorFrontendHost.h (modified) (1 diff)
• WebCore/inspector/InspectorFrontendHost.idl (modified) (1 diff)
• WebCore/inspector/front-end/InspectorFrontendHostStub.js (modified) (1 diff)
• WebCore/inspector/front-end/NetworkPanel.js (modified) (1 diff)
• WebCore/inspector/front-end/Settings.js (modified) (1 diff)
• WebCore/inspector/front-end/utilities.js (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/WebDevToolsFrontendClient.h (modified) (1 diff)
• WebKit/chromium/src/InspectorFrontendClientImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/InspectorFrontendClientImpl.h (modified) (1 diff)
• WebKit/chromium/src/js/DevTools.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-20  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add saveAs into the InspectorFrontendHost binding.
+        https://bugs.webkit.org/show_bug.cgi?id=58979
+
+        * English.lproj/localizedStrings.js:
+        * inspector/InspectorFrontendClient.h:
+        (WebCore::InspectorFrontendClient::saveAs):
+        (WebCore::InspectorFrontendClient::saveSessionSetting):
+        (WebCore::InspectorFrontendClient::loadSessionSetting):
+        * inspector/InspectorFrontendHost.cpp:
+        (WebCore::InspectorFrontendHost::saveAs):
+        * inspector/InspectorFrontendHost.h:
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/front-end/InspectorFrontendHostStub.js:
+        (.WebInspector.InspectorFrontendHostStub.prototype.saveAs.fr.onload):
+        (.WebInspector.InspectorFrontendHostStub.prototype.saveAs):
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype._contextMenu):
+        (WebInspector.NetworkPanel.prototype._copyAll):
+        (WebInspector.NetworkPanel.prototype._copyResource):
+        (WebInspector.NetworkPanel.prototype._exportAll):
+        (WebInspector.NetworkPanel.prototype._exportResource):
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/utilities.js:
+        ():
+
 2011-04-20  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorFrontendClient.h

@@ -59 +59 @@
     virtual void requestDetachWindow() = 0;
     virtual void changeAttachedWindowHeight(unsigned) = 0;
+    virtual void saveAs(const WTF::String& fileName, const WTF::String& content) { }
 
     virtual void inspectedURLChanged(const String&) = 0;
@@ -64 +65 @@
     virtual void sendMessageToBackend(const String&) = 0;
 
-    virtual void saveSessionSetting(const String&, const String&) {}
-    virtual void loadSessionSetting(const String&, String*) {}
+    virtual void saveSessionSetting(const String&, const String&) { }
+    virtual void loadSessionSetting(const String&, String*) { }
 };
 

trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp

@@ -221 +221 @@
 }
 
+void InspectorFrontendHost::saveAs(const String& fileName, const String& content)
+{
+    if (m_client)
+        m_client->saveAs(fileName, content);
+}
+
 void InspectorFrontendHost::saveSessionSetting(const String& key, const String& value)
 {

trunk/Source/WebCore/inspector/InspectorFrontendHost.h

@@ -75 +75 @@
 
     void copyText(const String& text);
+    void saveAs(const String& fileName, const String& content);
 
     void saveSessionSetting(const String& key, const String& value);

trunk/Source/WebCore/inspector/InspectorFrontendHost.idl

@@ -52 +52 @@
 
         void copyText(in DOMString text);
+        void saveAs(in DOMString fileName, in DOMString content);
 
         [Custom] DOMString platform();

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

@@ -116 +116 @@
     },
 
+    saveAs: function(fileName, content)
+    {
+        var builder = new WebKitBlobBuilder();
+        builder.append(content);
+        var blob = builder.getBlob("application/octet-stream");
+    
+        var fr = new FileReader();
+        fr.onload = function(e) {
+            // Force download
+            window.location = this.result;
+        }
+        fr.readAsDataURL(blob);
+    },
+
     canAttachWindow: function()
     {

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

@@ -998 +998 @@
         var gridNode = this._dataGrid.dataGridNodeFromNode(event.target);
         var resource = gridNode && gridNode._resource;
+
         if (resource)
-            contextMenu.appendItem(WebInspector.UIString("Copy entry as HAR"), this._exportResource.bind(this, resource));
-        contextMenu.appendItem(WebInspector.UIString("Copy network log as HAR"), this._exportAll.bind(this));
+            contextMenu.appendItem(WebInspector.UIString("Copy entry as HAR"), this._copyResource.bind(this, resource));
+        contextMenu.appendItem(WebInspector.UIString("Copy all as HAR"), this._copyAll.bind(this));
+
+        if (Preferences.saveAsAvailable) {
+            contextMenu.appendSeparator();
+            if (resource)
+                contextMenu.appendItem(WebInspector.UIString("Save entry as HAR"), this._exportResource.bind(this, resource));
+            contextMenu.appendItem(WebInspector.UIString("Save all as HAR"), this._exportAll.bind(this));
+        }
+
         contextMenu.show(event);
     },
 
-    _exportAll: function()
+    _copyAll: function()
     {
         var harArchive = {
             log: (new WebInspector.HARLog()).build()
-        }
+        };
         InspectorFrontendHost.copyText(JSON.stringify(harArchive));
     },
 
-    _exportResource: function(resource)
+    _copyResource: function(resource)
     {
         var har = (new WebInspector.HAREntry(resource)).build();
         InspectorFrontendHost.copyText(JSON.stringify(har));
+    },
+
+    _exportAll: function()
+    {
+        var harArchive = {
+            log: (new WebInspector.HARLog()).build()
+        };
+        InspectorFrontendHost.saveAs(WebInspector.mainResource.domain + ".har", JSON.stringify(harArchive));
+    },
+
+    _exportResource: function(resource)
+    {
+        var har = (new WebInspector.HAREntry(resource)).build();
+        InspectorFrontendHost.saveAs(resource.displayName + ".har", JSON.stringify(har));
     },
 

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

@@ -50 +50 @@
     debugMode: false,
     heapProfilerPresent: false,
-    detailedHeapProfiles: false
+    detailedHeapProfiles: false,
+    saveAsAvailable: false
 }
 

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

@@ -1075 +1075 @@
     return new RegExp(regex, "i" + (extraFlags || ""));
 }
-
-function offerFileForDownload(contents)
-{
-    var builder = new BlobBuilder();
-    builder.append(contents);
-    var blob = builder.getBlob("application/octet-stream");
-    var url = window.webkitURL.createObjectURL(blob);
-    window.open(url);
-}

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-20  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: add saveAs into the InspectorFrontendHost binding.
+        https://bugs.webkit.org/show_bug.cgi?id=58979
+
+        * public/WebDevToolsFrontendClient.h:
+        (WebKit::WebDevToolsFrontendClient::saveAs):
+        * src/InspectorFrontendClientImpl.cpp:
+        (WebKit::InspectorFrontendClientImpl::saveAs):
+        * src/InspectorFrontendClientImpl.h:
+        * src/js/DevTools.js:
+
 2011-04-19  Naoki Takano  <takano.naoki@gmail.com>
 

trunk/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h

@@ -50 +50 @@
     virtual void requestDockWindow() { }
     virtual void requestUndockWindow() { }
+    virtual void saveAs(const WebString& fileName, const WebString& content) { }
 
     virtual bool shouldHideScriptsPanel() { return false; }

trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.cpp

@@ -126 +126 @@
 }
     
+void InspectorFrontendClientImpl::saveAs(const String& fileName, const String& content)
+{
+    m_client->saveAs(fileName, content);
+}
+
 void InspectorFrontendClientImpl::inspectedURLChanged(const String& url)
 {

trunk/Source/WebKit/chromium/src/InspectorFrontendClientImpl.h

@@ -67 +67 @@
     virtual void requestDetachWindow();
     virtual void changeAttachedWindowHeight(unsigned);
+    virtual void saveAs(const WTF::String& fileName, const WTF::String& content);
 
     virtual void inspectedURLChanged(const WTF::String&);

trunk/Source/WebKit/chromium/src/js/DevTools.js

@@ -51 +51 @@
     Preferences.showTimingTab = true;
     Preferences.showCookiesTab = true;
+    Preferences.saveAsAvailable = true;
 })();