Changeset 225972 in webkit

Timestamp:

Dec 15, 2017 6:27:25 AM (6 years ago)

Author:

nael.ouedraogo@crf.canon.fr

Message:

[GTK] Add proxy option to Minibrowser
​https://bugs.webkit.org/show_bug.cgi?id=180750

Reviewed by Michael Catanzaro.

Add command line option to set proxy settings in GTK minibrowser.

• MiniBrowser/gtk/main.c:

(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/main.c (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-12-15  Nael Ouedraogo  <nael.ouedraogo@crf.canon.fr>
+
+        [GTK] Add proxy option to Minibrowser
+        https://bugs.webkit.org/show_bug.cgi?id=180750
+
+        Reviewed by Michael Catanzaro.
+
+        Add command line option to set proxy settings in GTK minibrowser.
+
+        * MiniBrowser/gtk/main.c:
+        (main):
+
 2017-12-14  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

trunk/Tools/MiniBrowser/gtk/main.c

@@ -38 +38 @@
 
 static const gchar **uriArguments = NULL;
+static const gchar **ignoreHosts = NULL;
 static GdkRGBA *backgroundColor;
 static gboolean editorMode;
@@ -46 +47 @@
 static gboolean fullScreen;
 static gboolean enableIntelligentTrackingPrevention;
+static const char *proxy;
 
 typedef enum {
@@ -103 +105 @@
     { "automation", 0, 0, G_OPTION_ARG_NONE, &automationMode, "Run in automation mode", NULL },
     { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableIntelligentTrackingPrevention, "Enable intelligent tracking prevention", NULL },
+    { "proxy", 0, 0, G_OPTION_ARG_STRING, &proxy, "Set proxy", "PROXY" },
+    { "ignore-host", 0, 0, G_OPTION_ARG_STRING_ARRAY, &ignoreHosts, "Set proxy ignore hosts", "HOSTS" },
     { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
     { 0, 0, 0, 0, 0, 0, 0 }
@@ -501 +505 @@
     WebKitWebContext *webContext = (privateMode || automationMode) ? webkit_web_context_new_ephemeral() : webkit_web_context_get_default();
 
+    if (proxy) {
+        WebKitNetworkProxySettings *webkitProxySettings = webkit_network_proxy_settings_new(proxy, ignoreHosts);
+        webkit_web_context_set_network_proxy_settings(webContext, WEBKIT_NETWORK_PROXY_MODE_CUSTOM, webkitProxySettings);
+        webkit_network_proxy_settings_free(webkitProxySettings);
+    }
+
     const gchar *singleprocess = g_getenv("MINIBROWSER_SINGLEPROCESS");
     webkit_web_context_set_process_model(webContext, (singleprocess && *singleprocess) ?