Changeset 253678 in webkit

Timestamp:

Dec 18, 2019 4:48:43 AM (4 years ago)

Author:

Philippe Normand

Message:

[GTK][WebInspector] Support for saving remote data
​https://bugs.webkit.org/show_bug.cgi?id=204618

Reviewed by Carlos Garcia Campos.

Similarly to what landed already in r251069, the Remote
WebInspector GTK client can now save data coming from the
inspector server.

• UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp:

(WebKit::RemoteWebInspectorProxy::platformSave):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp (modified) (3 diffs)
• UIProcess/gtk/WebInspectorProxyGtk.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-12-18  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK][WebInspector] Support for saving remote data
+        https://bugs.webkit.org/show_bug.cgi?id=204618
+
+        Reviewed by Carlos Garcia Campos.
+
+        Similarly to what landed already in r251069, the Remote
+        WebInspector GTK client can now save data coming from the
+        inspector server.
+
+        * UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp:
+        (WebKit::RemoteWebInspectorProxy::platformSave):
+
 2019-12-17  Joonghun Park  <jh718.park@samsung.com>
 

trunk/Source/WebKit/UIProcess/gtk/RemoteWebInspectorProxyGtk.cpp

@@ -29 +29 @@
 #if ENABLE(REMOTE_INSPECTOR)
 
+#include "RemoteWebInspectorUIMessages.h"
 #include "WebInspectorProxy.h"
 #include "WebKitInspectorWindow.h"
@@ -34 +35 @@
 #include "WebPageGroup.h"
 #include <WebCore/CertificateInfo.h>
+#include <wtf/text/Base64.h>
 
 namespace WebKit {
@@ -100 +102 @@
 }
 
-void RemoteWebInspectorProxy::platformSave(const String&, const String&, bool, bool)
+static void remoteFileReplaceContentsCallback(GObject* sourceObject, GAsyncResult* result, gpointer userData)
 {
+    GFile* file = G_FILE(sourceObject);
+    if (!g_file_replace_contents_finish(file, result, nullptr, nullptr))
+        return;
+
+    auto* page = static_cast<WebPageProxy*>(userData);
+    GUniquePtr<char> path(g_file_get_path(file));
+    page->process().send(Messages::RemoteWebInspectorUI::DidSave(path.get()), page->webPageID());
+}
+
+void RemoteWebInspectorProxy::platformSave(const String& suggestedURL, const String& content, bool base64Encoded, bool forceSaveDialog)
+{
+    UNUSED_PARAM(forceSaveDialog);
+
+    GRefPtr<GtkFileChooserNative> dialog = adoptGRef(gtk_file_chooser_native_new("Save File",
+        GTK_WINDOW(m_window), GTK_FILE_CHOOSER_ACTION_SAVE, "Save", "Cancel"));
+
+    GtkFileChooser* chooser = GTK_FILE_CHOOSER(dialog.get());
+    gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
+
+    // Some inspector views (Audits for instance) use a custom URI scheme, such
+    // as web-inspector. So we can't rely on the URL being a valid file:/// URL
+    // unfortunately.
+    URL url(URL(), suggestedURL);
+    // Strip leading / character.
+    gtk_file_chooser_set_current_name(chooser, url.path().substring(1).utf8().data());
+
+    if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(dialog.get())) != GTK_RESPONSE_ACCEPT)
+        return;
+
+    Vector<char> dataVector;
+    CString dataString;
+    if (base64Encoded) {
+        if (!base64Decode(content, dataVector, Base64ValidatePadding))
+            return;
+        dataVector.shrinkToFit();
+    } else
+        dataString = content.utf8();
+
+    const char* data = !dataString.isNull() ? dataString.data() : dataVector.data();
+    size_t dataLength = !dataString.isNull() ? dataString.length() : dataVector.size();
+    GRefPtr<GFile> file = adoptGRef(gtk_file_chooser_get_file(chooser));
+    GUniquePtr<char> path(g_file_get_path(file.get()));
+    g_file_replace_contents_async(file.get(), data, dataLength, nullptr, false,
+        G_FILE_CREATE_REPLACE_DESTINATION, nullptr, remoteFileReplaceContentsCallback, m_inspectorPage);
 }
 

trunk/Source/WebKit/UIProcess/gtk/WebInspectorProxyGtk.cpp

@@ -461 +461 @@
 }
 
-void WebInspectorProxy::platformSave(const String& filename, const String& content, bool base64Encoded, bool forceSaveDialog)
+static void fileReplaceContentsCallback(GObject* sourceObject, GAsyncResult* result, gpointer userData)
+{
+    GFile* file = G_FILE(sourceObject);
+    if (!g_file_replace_contents_finish(file, result, nullptr, nullptr))
+        return;
+
+    auto* page = static_cast<WebPageProxy*>(userData);
+    GUniquePtr<char> path(g_file_get_path(file));
+    page->process().send(Messages::WebInspectorUI::DidSave(path.get()), page->webPageID());
+}
+
+void WebInspectorProxy::platformSave(const String& suggestedURL, const String& content, bool base64Encoded, bool forceSaveDialog)
 {
     UNUSED_PARAM(forceSaveDialog);
@@ -474 +485 @@
     GtkFileChooser* chooser = GTK_FILE_CHOOSER(dialog.get());
     gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
-    gtk_file_chooser_set_current_name(chooser, filename.utf8().data());
+
+    // Some inspector views (Audits for instance) use a custom URI scheme, such
+    // as web-inspector. So we can't rely on the URL being a valid file:/// URL
+    // unfortunately.
+    URL url(URL(), suggestedURL);
+    // Strip leading / character.
+    gtk_file_chooser_set_current_name(chooser, url.path().substring(1).utf8().data());
 
     if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(dialog.get())) != GTK_RESPONSE_ACCEPT)
@@ -492 +509 @@
     GRefPtr<GFile> file = adoptGRef(gtk_file_chooser_get_file(chooser));
     GUniquePtr<char> path(g_file_get_path(file.get()));
-    if (g_file_set_contents(path.get(), data, dataLength, nullptr))
-        m_inspectorPage->send(Messages::WebInspectorUI::DidSave(path.get()));
+    g_file_replace_contents_async(file.get(), data, dataLength, nullptr, false,
+        G_FILE_CREATE_REPLACE_DESTINATION, nullptr, fileReplaceContentsCallback, m_inspectorPage);
 }