[epiphany] Rename webextension to webprocessextension
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Rename webextension to webprocessextension
- Date: Sun, 12 May 2019 22:14:07 +0000 (UTC)
commit 53c5022ab04d24b6a44e4a197eb9a7d08cf96595
Author: Jan-Michael Brummer <jan brummer tabos org>
Date: Sun May 12 01:02:09 2019 +0200
Rename webextension to webprocessextension
In order to avoid future conflicts with official web browser web extension, rename our current
webextensions to webprocessextension.
embed/ephy-embed-shell.c | 202 ++++++------
embed/ephy-web-extension-proxy.c | 337 ---------------------
embed/ephy-web-extension-proxy.h | 54 ----
embed/ephy-web-process-extension-proxy.c | 337 +++++++++++++++++++++
embed/ephy-web-process-extension-proxy.h | 54 ++++
embed/ephy-web-view.c | 28 +-
embed/ephy-web-view.h | 4 +-
embed/meson.build | 4 +-
embed/web-extension/ephy-web-extension.h | 41 ---
embed/web-extension/meson.build | 28 --
.../ephy-uri-tester.c | 6 +-
.../ephy-uri-tester.h | 0
.../ephy-web-overview-model.c | 0
.../ephy-web-overview-model.h | 0
.../ephy-web-process-extension-main.c} | 26 +-
.../ephy-web-process-extension.c} | 161 +++++-----
.../ephy-web-process-extension.h | 41 +++
embed/web-process-extension/meson.build | 28 ++
.../epiphany-web-process-extension.gresource.xml} | 2 +-
.../resources/js/ephy.js | 0
.../resources/js/overview.js | 0
lib/ephy-dbus-names.h | 6 +-
lib/ephy-settings.h | 22 +-
meson.build | 4 +-
24 files changed, 693 insertions(+), 692 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 4fc745453..c3f7d5dbb 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -44,7 +44,7 @@
#include "ephy-uri-tester-shared.h"
#include "ephy-view-source-handler.h"
#include "ephy-web-app-utils.h"
-#include "ephy-web-extension-proxy.h"
+#include "ephy-web-process-extension-proxy.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
@@ -69,7 +69,7 @@ typedef struct {
EphyViewSourceHandler *source_handler;
char *guid;
GDBusServer *dbus_server;
- GList *web_extensions;
+ GList *web_process_extensions;
EphyFiltersManager *filters_manager;
EphySearchEngineManager *search_engine_manager;
GCancellable *cancellable;
@@ -136,13 +136,13 @@ ephy_embed_shell_get_view_for_page_id (EphyEmbedShell *self,
return NULL;
}
-static EphyWebExtensionProxy *
+static EphyWebProcessExtensionProxy *
ephy_embed_shell_get_extension_proxy_for_page_id (EphyEmbedShell *self,
guint64 page_id,
const char *origin)
{
EphyWebView *view = ephy_embed_shell_get_view_for_page_id (self, page_id, origin);
- return view ? ephy_web_view_get_web_extension_proxy (view) : NULL;
+ return view ? ephy_web_view_get_web_process_extension_proxy (view) : NULL;
}
static GList *
@@ -196,9 +196,9 @@ ephy_embed_shell_dispose (GObject *object)
g_clear_object (&priv->cancellable);
}
- if (priv->web_extensions) {
- g_list_free_full (priv->web_extensions, g_object_unref);
- priv->web_extensions = NULL;
+ if (priv->web_process_extensions) {
+ g_list_free_full (priv->web_process_extensions, g_object_unref);
+ priv->web_process_extensions = NULL;
}
g_clear_object (&priv->encodings);
@@ -222,9 +222,9 @@ ephy_embed_shell_dispose (GObject *object)
}
static void
-web_extension_password_form_focused_message_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_password_form_focused_message_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
guint64 page_id;
gboolean insecure_action;
@@ -251,10 +251,10 @@ history_service_query_urls_cb (EphyHistoryService *service,
if (!success)
return;
- for (l = priv->web_extensions; l; l = g_list_next (l)) {
- EphyWebExtensionProxy *web_extension = (EphyWebExtensionProxy *)l->data;
+ for (l = priv->web_process_extensions; l; l = g_list_next (l)) {
+ EphyWebProcessExtensionProxy *web_process_extension = (EphyWebProcessExtensionProxy *)l->data;
- ephy_web_extension_proxy_history_set_urls (web_extension, urls);
+ ephy_web_process_extension_proxy_history_set_urls (web_process_extension, urls);
}
for (l = urls; l; l = g_list_next (l))
@@ -293,9 +293,9 @@ history_set_url_hidden_cb (EphyHistoryService *service,
}
static void
-web_extension_overview_message_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_overview_message_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
g_autofree char *url_to_remove = NULL;
@@ -309,9 +309,9 @@ web_extension_overview_message_received_cb (WebKitUserContentManager *manager,
}
static void
-web_extension_tls_error_page_message_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_tls_error_page_message_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
guint64 page_id;
@@ -320,9 +320,9 @@ web_extension_tls_error_page_message_received_cb (WebKitUserContentManager *mana
}
static void
-web_extension_unsafe_browsing_error_page_message_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_unsafe_browsing_error_page_message_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
guint64 page_id;
@@ -331,9 +331,9 @@ web_extension_unsafe_browsing_error_page_message_received_cb (WebKitUserContentM
}
static void
-web_extension_about_apps_message_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_about_apps_message_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
g_autofree char *app_id = NULL;
@@ -370,11 +370,11 @@ password_manager_query_finished_cb (GList *records,
password = ephy_password_record_get_password (record);
}
- EphyWebExtensionProxy *proxy = ephy_embed_shell_get_extension_proxy_for_page_id (data->shell,
+ EphyWebProcessExtensionProxy *proxy = ephy_embed_shell_get_extension_proxy_for_page_id (data->shell,
data->page_id,
data->origin);
if (proxy)
- ephy_web_extension_proxy_password_query_response (proxy, username, password, data->promise_id,
data->page_id);
+ ephy_web_process_extension_proxy_password_query_response (proxy, username, password, data->promise_id,
data->page_id);
password_manager_data_free (data);
}
@@ -406,9 +406,9 @@ property_to_uint64 (JSCValue *value,
}
static void
-web_extension_password_manager_query_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_password_manager_query_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
JSCValue *value = webkit_javascript_result_get_js_value (message);
@@ -483,9 +483,9 @@ save_auth_request_response_cb (gint response_id,
}
static void
-web_extension_password_manager_save_real (EphyEmbedShell *shell,
- JSCValue *value,
- gboolean is_request)
+web_process_extension_password_manager_save_real (EphyEmbedShell *shell,
+ JSCValue *value,
+ gboolean is_request)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
g_autofree char *origin = property_to_string_or_null (value, "origin");
@@ -545,27 +545,27 @@ web_extension_password_manager_save_real (EphyEmbedShell *shell,
}
static void
-web_extension_password_manager_save_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_password_manager_save_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
JSCValue *value = webkit_javascript_result_get_js_value (message);
- web_extension_password_manager_save_real (shell, value, FALSE);
+ web_process_extension_password_manager_save_real (shell, value, FALSE);
}
static void
-web_extension_password_manager_request_save_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_password_manager_request_save_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
JSCValue *value = webkit_javascript_result_get_js_value (message);
- web_extension_password_manager_save_real (shell, value, TRUE);
+ web_process_extension_password_manager_save_real (shell, value, TRUE);
}
static void
-web_extension_password_manager_query_usernames_received_cb (WebKitUserContentManager *manager,
- WebKitJavascriptResult *message,
- EphyEmbedShell *shell)
+web_process_extension_password_manager_query_usernames_received_cb (WebKitUserContentManager *manager,
+ WebKitJavascriptResult *message,
+ EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
@@ -580,9 +580,9 @@ web_extension_password_manager_query_usernames_received_cb (WebKitUserContentMan
usernames = ephy_password_manager_get_usernames_for_origin (priv->password_manager, origin);
- EphyWebExtensionProxy *proxy = ephy_embed_shell_get_extension_proxy_for_page_id (shell, page_id, origin);
+ EphyWebProcessExtensionProxy *proxy = ephy_embed_shell_get_extension_proxy_for_page_id (shell, page_id,
origin);
if (proxy)
- ephy_web_extension_proxy_password_query_usernames_response (proxy, usernames, promise_id, page_id);
+ ephy_web_process_extension_proxy_password_query_usernames_response (proxy, usernames, promise_id,
page_id);
}
static void
@@ -594,10 +594,10 @@ history_service_url_title_changed_cb (EphyHistoryService *service,
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
GList *l;
- for (l = priv->web_extensions; l; l = g_list_next (l)) {
- EphyWebExtensionProxy *web_extension = (EphyWebExtensionProxy *)l->data;
+ for (l = priv->web_process_extensions; l; l = g_list_next (l)) {
+ EphyWebProcessExtensionProxy *web_process_extension = (EphyWebProcessExtensionProxy *)l->data;
- ephy_web_extension_proxy_history_set_url_title (web_extension, url, title);
+ ephy_web_process_extension_proxy_history_set_url_title (web_process_extension, url, title);
}
}
@@ -609,10 +609,10 @@ history_service_url_deleted_cb (EphyHistoryService *service,
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
GList *l;
- for (l = priv->web_extensions; l; l = g_list_next (l)) {
- EphyWebExtensionProxy *web_extension = (EphyWebExtensionProxy *)l->data;
+ for (l = priv->web_process_extensions; l; l = g_list_next (l)) {
+ EphyWebProcessExtensionProxy *web_process_extension = (EphyWebProcessExtensionProxy *)l->data;
- ephy_web_extension_proxy_history_delete_url (web_extension, url->url);
+ ephy_web_process_extension_proxy_history_delete_url (web_process_extension, url->url);
}
}
@@ -627,10 +627,10 @@ history_service_host_deleted_cb (EphyHistoryService *service,
deleted_uri = soup_uri_new (deleted_url);
- for (l = priv->web_extensions; l; l = g_list_next (l)) {
- EphyWebExtensionProxy *web_extension = (EphyWebExtensionProxy *)l->data;
+ for (l = priv->web_process_extensions; l; l = g_list_next (l)) {
+ EphyWebProcessExtensionProxy *web_process_extension = (EphyWebProcessExtensionProxy *)l->data;
- ephy_web_extension_proxy_history_delete_host (web_extension, soup_uri_get_host (deleted_uri));
+ ephy_web_process_extension_proxy_history_delete_host (web_process_extension, soup_uri_get_host
(deleted_uri));
}
}
@@ -641,23 +641,23 @@ history_service_cleared_cb (EphyHistoryService *service,
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
GList *l;
- for (l = priv->web_extensions; l; l = g_list_next (l)) {
- EphyWebExtensionProxy *web_extension = (EphyWebExtensionProxy *)l->data;
+ for (l = priv->web_process_extensions; l; l = g_list_next (l)) {
+ EphyWebProcessExtensionProxy *web_process_extension = (EphyWebProcessExtensionProxy *)l->data;
- ephy_web_extension_proxy_history_clear (web_extension);
+ ephy_web_process_extension_proxy_history_clear (web_process_extension);
}
}
typedef struct {
- EphyWebExtensionProxy *extension;
+ EphyWebProcessExtensionProxy *extension;
char *url;
char *path;
} DelayedThumbnailUpdateData;
static DelayedThumbnailUpdateData *
-delayed_thumbnail_update_data_new (EphyWebExtensionProxy *extension,
- const char *url,
- const char *path)
+delayed_thumbnail_update_data_new (EphyWebProcessExtensionProxy *extension,
+ const char *url,
+ const char *path)
{
DelayedThumbnailUpdateData *data = g_new (DelayedThumbnailUpdateData, 1);
data->extension = extension;
@@ -686,12 +686,12 @@ delayed_thumbnail_update_cb (DelayedThumbnailUpdateData *data)
}
if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (data->extension), "initialized"))) {
- ephy_web_extension_proxy_history_set_url_thumbnail (data->extension, data->url, data->path);
+ ephy_web_process_extension_proxy_history_set_url_thumbnail (data->extension, data->url, data->path);
delayed_thumbnail_update_data_free (data);
return G_SOURCE_REMOVE;
}
- /* Web extension is not initialized yet, try again later.... */
+ /* Web process extension is not initialized yet, try again later.... */
return G_SOURCE_CONTINUE;
}
@@ -703,12 +703,12 @@ ephy_embed_shell_set_thumbnail_path (EphyEmbedShell *shell,
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
GList *l;
- for (l = priv->web_extensions; l; l = g_list_next (l)) {
- EphyWebExtensionProxy *web_extension = (EphyWebExtensionProxy *)l->data;
- if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (web_extension), "initialized"))) {
- ephy_web_extension_proxy_history_set_url_thumbnail (web_extension, url, path);
+ for (l = priv->web_process_extensions; l; l = g_list_next (l)) {
+ EphyWebProcessExtensionProxy *web_process_extension = (EphyWebProcessExtensionProxy *)l->data;
+ if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (web_process_extension), "initialized"))) {
+ ephy_web_process_extension_proxy_history_set_url_thumbnail (web_process_extension, url, path);
} else {
- DelayedThumbnailUpdateData *data = delayed_thumbnail_update_data_new (web_extension, url, path);
+ DelayedThumbnailUpdateData *data = delayed_thumbnail_update_data_new (web_process_extension, url,
path);
g_timeout_add (50, (GSourceFunc)delayed_thumbnail_update_cb, data);
}
}
@@ -917,8 +917,8 @@ ftp_request_cb (WebKitURISchemeRequest *request)
}
static void
-initialize_web_extensions (WebKitWebContext *web_context,
- EphyEmbedShell *shell)
+initialize_web_process_extensions (WebKitWebContext *web_context,
+ EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
g_autoptr(GVariant) user_data = NULL;
@@ -927,9 +927,9 @@ initialize_web_extensions (WebKitWebContext *web_context,
const char *address;
#if DEVELOPER_MODE
- webkit_web_context_set_web_extensions_directory (web_context, BUILD_ROOT "/embed/web-extension");
+ webkit_web_context_set_web_extensions_directory (web_context, BUILD_ROOT "/embed/web-process-extension");
#else
- webkit_web_context_set_web_extensions_directory (web_context, EPHY_WEB_EXTENSIONS_DIR);
+ webkit_web_context_set_web_extensions_directory (web_context, EPHY_WEB_PROCESS_EXTENSIONS_DIR);
#endif
address = priv->dbus_server ? g_dbus_server_get_client_address (priv->dbus_server) : NULL;
@@ -962,21 +962,21 @@ initialize_notification_permissions (WebKitWebContext *web_context,
}
static void
-web_extension_page_created (EphyWebExtensionProxy *extension,
- guint64 page_id,
- EphyEmbedShell *shell)
+web_process_extension_page_created (EphyWebProcessExtensionProxy *extension,
+ guint64 page_id,
+ EphyEmbedShell *shell)
{
g_object_set_data (G_OBJECT (extension), "initialized", GINT_TO_POINTER (TRUE));
g_signal_emit (shell, signals[PAGE_CREATED], 0, page_id, extension);
}
static void
-web_extension_connection_closed (EphyWebExtensionProxy *extension,
+web_process_extension_connection_closed (EphyWebProcessExtensionProxy *extension,
EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
- priv->web_extensions = g_list_remove (priv->web_extensions, extension);
+ priv->web_process_extensions = g_list_remove (priv->web_process_extensions, extension);
g_object_unref (extension);
}
@@ -986,16 +986,16 @@ new_connection_cb (GDBusServer *server,
EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
- g_autoptr(EphyWebExtensionProxy) extension = NULL;
+ g_autoptr(EphyWebProcessExtensionProxy) extension = NULL;
- extension = ephy_web_extension_proxy_new (connection);
+ extension = ephy_web_process_extension_proxy_new (connection);
g_signal_connect_object (extension, "page-created",
- G_CALLBACK (web_extension_page_created), shell, 0);
+ G_CALLBACK (web_process_extension_page_created), shell, 0);
g_signal_connect_object (extension, "connection-closed",
- G_CALLBACK (web_extension_connection_closed), shell, 0);
+ G_CALLBACK (web_process_extension_connection_closed), shell, 0);
- priv->web_extensions = g_list_prepend (priv->web_extensions, g_steal_pointer (&extension));
+ priv->web_process_extensions = g_list_prepend (priv->web_process_extensions, g_steal_pointer (&extension));
return TRUE;
}
@@ -1010,7 +1010,7 @@ authorize_authenticated_peer_cb (GDBusAuthObserver *observer,
}
static void
-ephy_embed_shell_setup_web_extensions_server (EphyEmbedShell *shell)
+ephy_embed_shell_setup_web_process_extensions_server (EphyEmbedShell *shell)
{
EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
g_autoptr(GDBusAuthObserver) observer = NULL;
@@ -1026,7 +1026,7 @@ ephy_embed_shell_setup_web_extensions_server (EphyEmbedShell *shell)
/* Why sync?
*
- * (a) The server must be started before web extensions try to connect.
+ * (a) The server must be started before web process extensions try to connect.
* (b) Gio actually has no async version. Don't know why.
*/
priv->dbus_server = g_dbus_server_new_sync (address,
@@ -1037,7 +1037,7 @@ ephy_embed_shell_setup_web_extensions_server (EphyEmbedShell *shell)
&error);
if (error) {
- g_warning ("Failed to start web extension server on %s: %s", address, error->message);
+ g_warning ("Failed to start web process extension server on %s: %s", address, error->message);
return;
}
@@ -1120,7 +1120,7 @@ ephy_embed_shell_startup (GApplication *application)
ephy_embed_shell_create_web_context (shell);
- ephy_embed_shell_setup_web_extensions_server (shell);
+ ephy_embed_shell_setup_web_process_extensions_server (shell);
/* User content manager */
if (priv->mode != EPHY_EMBED_SHELL_MODE_TEST)
@@ -1130,66 +1130,66 @@ ephy_embed_shell_startup (GApplication *application)
"overview",
priv->guid);
g_signal_connect_object (priv->user_content, "script-message-received::overview",
- G_CALLBACK (web_extension_overview_message_received_cb),
+ G_CALLBACK (web_process_extension_overview_message_received_cb),
shell, 0);
webkit_user_content_manager_register_script_message_handler (priv->user_content,
"tlsErrorPage");
g_signal_connect_object (priv->user_content, "script-message-received::tlsErrorPage",
- G_CALLBACK (web_extension_tls_error_page_message_received_cb),
+ G_CALLBACK (web_process_extension_tls_error_page_message_received_cb),
shell, 0);
webkit_user_content_manager_register_script_message_handler (priv->user_content,
"unsafeBrowsingErrorPage");
g_signal_connect_object (priv->user_content, "script-message-received::unsafeBrowsingErrorPage",
- G_CALLBACK (web_extension_unsafe_browsing_error_page_message_received_cb),
+ G_CALLBACK (web_process_extension_unsafe_browsing_error_page_message_received_cb),
shell, 0);
webkit_user_content_manager_register_script_message_handler_in_world (priv->user_content,
"passwordFormFocused",
priv->guid);
g_signal_connect_object (priv->user_content, "script-message-received::passwordFormFocused",
- G_CALLBACK (web_extension_password_form_focused_message_received_cb),
+ G_CALLBACK (web_process_extension_password_form_focused_message_received_cb),
shell, 0);
webkit_user_content_manager_register_script_message_handler (priv->user_content,
"aboutApps");
g_signal_connect_object (priv->user_content, "script-message-received::aboutApps",
- G_CALLBACK (web_extension_about_apps_message_received_cb),
+ G_CALLBACK (web_process_extension_about_apps_message_received_cb),
shell, 0);
webkit_user_content_manager_register_script_message_handler_in_world (priv->user_content,
"passwordManagerQuery",
priv->guid);
g_signal_connect (priv->user_content, "script-message-received::passwordManagerQuery",
- G_CALLBACK (web_extension_password_manager_query_received_cb),
+ G_CALLBACK (web_process_extension_password_manager_query_received_cb),
shell);
webkit_user_content_manager_register_script_message_handler_in_world (priv->user_content,
"passwordManagerQueryUsernames",
priv->guid);
g_signal_connect (priv->user_content, "script-message-received::passwordManagerQueryUsernames",
- G_CALLBACK (web_extension_password_manager_query_usernames_received_cb),
+ G_CALLBACK (web_process_extension_password_manager_query_usernames_received_cb),
shell);
webkit_user_content_manager_register_script_message_handler_in_world (priv->user_content,
"passwordManagerSave",
priv->guid);
g_signal_connect (priv->user_content, "script-message-received::passwordManagerSave",
- G_CALLBACK (web_extension_password_manager_save_received_cb),
+ G_CALLBACK (web_process_extension_password_manager_save_received_cb),
shell);
webkit_user_content_manager_register_script_message_handler_in_world (priv->user_content,
"passwordManagerRequestSave",
priv->guid);
g_signal_connect (priv->user_content, "script-message-received::passwordManagerRequestSave",
- G_CALLBACK (web_extension_password_manager_request_save_received_cb),
+ G_CALLBACK (web_process_extension_password_manager_request_save_received_cb),
shell);
webkit_web_context_set_process_model (priv->web_context,
WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
g_signal_connect_object (priv->web_context, "initialize-web-extensions",
- G_CALLBACK (initialize_web_extensions),
+ G_CALLBACK (initialize_web_process_extensions),
shell, 0);
priv->permissions_manager = ephy_permissions_manager_new ();
@@ -1423,7 +1423,7 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass)
* EphyEmbedShell::page-created:
* @shell: the #EphyEmbedShell
* @page_id: the identifier of the web page created
- * @web_extension: the #EphyWebExtensionProxy
+ * @web_process_extension: the #EphyWebProcessExtensionProxy
*
* Emitted when a web page is created in the web process.
*/
@@ -1434,14 +1434,14 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass)
0, NULL, NULL, NULL,
G_TYPE_NONE, 2,
G_TYPE_UINT64,
- EPHY_TYPE_WEB_EXTENSION_PROXY);
+ EPHY_TYPE_WEB_PROCESS_EXTENSION_PROXY);
/**
* EphyEmbedShell::allow-tls-certificate:
* @shell: the #EphyEmbedShell
* @page_id: the identifier of the web page
*
- * Emitted when the web extension requests an exception be
+ * Emitted when the web process extension requests an exception be
* permitted for the invalid TLS certificate on the given page
*/
signals[ALLOW_TLS_CERTIFICATE] =
@@ -1457,7 +1457,7 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass)
* @shell: the #EphyEmbedShell
* @page_id: the identifier of the web page
*
- * Emitted when the web extension requests an exception be
+ * Emitted when the web process extension requests an exception be
* permitted for the unsafe browsing warning on the given page
*/
signals[ALLOW_UNSAFE_BROWSING] =
diff --git a/embed/ephy-web-process-extension-proxy.c b/embed/ephy-web-process-extension-proxy.c
new file mode 100644
index 000000000..5a05acc25
--- /dev/null
+++ b/embed/ephy-web-process-extension-proxy.c
@@ -0,0 +1,337 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Copyright © 2014 Igalia S.L.
+ *
+ * This file is part of Epiphany.
+ *
+ * Epiphany is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Epiphany is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include "ephy-web-process-extension-proxy.h"
+
+#include "ephy-dbus-names.h"
+#include "ephy-history-service.h"
+
+struct _EphyWebProcessExtensionProxy {
+ GObject parent_instance;
+
+ GCancellable *cancellable;
+ GDBusProxy *proxy;
+ GDBusConnection *connection;
+
+ guint page_created_signal_id;
+};
+
+enum {
+ PAGE_CREATED,
+ CONNECTION_CLOSED,
+
+ LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+G_DEFINE_TYPE (EphyWebProcessExtensionProxy, ephy_web_process_extension_proxy, G_TYPE_OBJECT)
+
+static void
+ephy_web_process_extension_proxy_dispose (GObject *object)
+{
+ EphyWebProcessExtensionProxy *web_process_extension = EPHY_WEB_PROCESS_EXTENSION_PROXY (object);
+
+ if (web_process_extension->page_created_signal_id > 0) {
+ g_dbus_connection_signal_unsubscribe (web_process_extension->connection,
+ web_process_extension->page_created_signal_id);
+ web_process_extension->page_created_signal_id = 0;
+ }
+
+ if (web_process_extension->cancellable) {
+ g_cancellable_cancel (web_process_extension->cancellable);
+ g_clear_object (&web_process_extension->cancellable);
+ }
+
+ g_clear_object (&web_process_extension->proxy);
+ g_clear_object (&web_process_extension->connection);
+
+ G_OBJECT_CLASS (ephy_web_process_extension_proxy_parent_class)->dispose (object);
+}
+
+static void
+ephy_web_process_extension_proxy_init (EphyWebProcessExtensionProxy *web_process_extension)
+{
+}
+
+static void
+ephy_web_process_extension_proxy_class_init (EphyWebProcessExtensionProxyClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->dispose = ephy_web_process_extension_proxy_dispose;
+
+ signals[PAGE_CREATED] =
+ g_signal_new ("page-created",
+ EPHY_TYPE_WEB_PROCESS_EXTENSION_PROXY,
+ G_SIGNAL_RUN_FIRST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_UINT64);
+
+ signals[CONNECTION_CLOSED] =
+ g_signal_new ("connection-closed",
+ EPHY_TYPE_WEB_PROCESS_EXTENSION_PROXY,
+ G_SIGNAL_RUN_FIRST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
+}
+
+static void
+web_process_extension_page_created (GDBusConnection *connection,
+ const char *sender_name,
+ const char *object_path,
+ const char *interface_name,
+ const char *signal_name,
+ GVariant *parameters,
+ EphyWebProcessExtensionProxy *web_process_extension)
+{
+ guint64 page_id;
+ g_variant_get (parameters, "(t)", &page_id);
+ g_signal_emit (web_process_extension, signals[PAGE_CREATED], 0, page_id);
+}
+
+static void
+web_process_extension_proxy_created_cb (GDBusProxy *proxy,
+ GAsyncResult *result,
+ EphyWebProcessExtensionProxy *web_process_extension)
+{
+ g_autoptr(GError) error = NULL;
+
+ web_process_extension->proxy = g_dbus_proxy_new_finish (result, &error);
+ if (!web_process_extension->proxy) {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ g_warning ("Error creating web process extension proxy: %s", error->message);
+
+ /* Attempt to trigger connection_closed_cb, which will emit the
+ * connection-closed signal, ensuring that EphyEmbedShell will
+ * remove us from its extensions list.
+ */
+ g_dbus_connection_close (web_process_extension->connection,
+ web_process_extension->cancellable,
+ NULL /* GAsyncReadyCallback */,
+ NULL);
+ g_object_unref (web_process_extension);
+ return;
+ }
+
+ web_process_extension->page_created_signal_id =
+ g_dbus_connection_signal_subscribe (web_process_extension->connection,
+ NULL,
+ EPHY_WEB_PROCESS_EXTENSION_INTERFACE,
+ "PageCreated",
+ EPHY_WEB_PROCESS_EXTENSION_OBJECT_PATH,
+ NULL,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ (GDBusSignalCallback)web_process_extension_page_created,
+ web_process_extension,
+ NULL);
+ g_object_unref (web_process_extension);
+}
+
+static void
+connection_closed_cb (GDBusConnection *connection,
+ gboolean remote_peer_vanished,
+ GError *error,
+ EphyWebProcessExtensionProxy *web_process_extension)
+{
+ if (error && !remote_peer_vanished)
+ g_warning ("Unexpectedly lost connection to web process extension: %s", error->message);
+
+ g_signal_emit (web_process_extension, signals[CONNECTION_CLOSED], 0);
+}
+
+EphyWebProcessExtensionProxy *
+ephy_web_process_extension_proxy_new (GDBusConnection *connection)
+{
+ EphyWebProcessExtensionProxy *web_process_extension;
+
+ g_assert (G_IS_DBUS_CONNECTION (connection));
+
+ web_process_extension = g_object_new (EPHY_TYPE_WEB_PROCESS_EXTENSION_PROXY, NULL);
+
+ g_signal_connect (connection, "closed",
+ G_CALLBACK (connection_closed_cb), web_process_extension);
+
+ web_process_extension->cancellable = g_cancellable_new ();
+ web_process_extension->connection = g_object_ref (connection);
+
+ g_dbus_proxy_new (connection,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ NULL,
+ NULL,
+ EPHY_WEB_PROCESS_EXTENSION_OBJECT_PATH,
+ EPHY_WEB_PROCESS_EXTENSION_INTERFACE,
+ web_process_extension->cancellable,
+ (GAsyncReadyCallback)web_process_extension_proxy_created_cb,
+ g_object_ref (web_process_extension));
+
+ return web_process_extension;
+}
+
+void
+ephy_web_process_extension_proxy_history_set_urls (EphyWebProcessExtensionProxy *web_process_extension,
+ GList *urls)
+{
+ GList *l;
+ GVariantBuilder builder;
+
+ if (!web_process_extension->proxy)
+ return;
+
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
+ for (l = urls; l; l = g_list_next (l)) {
+ EphyHistoryURL *url = (EphyHistoryURL *)l->data;
+
+ g_variant_builder_add (&builder, "(ss)", url->url, url->title);
+ }
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "HistorySetURLs",
+ g_variant_new ("(@a(ss))", g_variant_builder_end (&builder)),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_history_set_url_thumbnail (EphyWebProcessExtensionProxy
*web_process_extension,
+ const char *url,
+ const char *path)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "HistorySetURLThumbnail",
+ g_variant_new ("(ss)", url, path),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_history_set_url_title (EphyWebProcessExtensionProxy *web_process_extension,
+ const char *url,
+ const char *title)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "HistorySetURLTitle",
+ g_variant_new ("(ss)", url, title),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_history_delete_url (EphyWebProcessExtensionProxy *web_process_extension,
+ const char *url)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "HistoryDeleteURL",
+ g_variant_new ("(s)", url),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_history_delete_host (EphyWebProcessExtensionProxy *web_process_extension,
+ const char *host)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "HistoryDeleteHost",
+ g_variant_new ("(s)", host),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_history_clear (EphyWebProcessExtensionProxy *web_process_extension)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "HistoryClear",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_password_query_usernames_response (EphyWebProcessExtensionProxy
*web_process_extension,
+ GList *users,
+ gint32 promise_id,
+ guint64 page_id)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ GList *l;
+ g_auto(GVariantBuilder) builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE_STRING_ARRAY);
+ for (l = users; l != NULL; l = l->next)
+ g_variant_builder_add (&builder, "s", l->data);
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "PasswordQueryUsernamesResponse",
+ g_variant_new ("(asit)", &builder, promise_id, page_id),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
+
+void
+ephy_web_process_extension_proxy_password_query_response (EphyWebProcessExtensionProxy
*web_process_extension,
+ const char *username,
+ const char *password,
+ gint32 promise_id,
+ guint64 page_id)
+{
+ if (!web_process_extension->proxy)
+ return;
+
+ g_dbus_proxy_call (web_process_extension->proxy,
+ "PasswordQueryResponse",
+ g_variant_new ("(ssit)", username ?: "", password ?: "", promise_id, page_id),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ web_process_extension->cancellable,
+ NULL, NULL);
+}
diff --git a/embed/ephy-web-process-extension-proxy.h b/embed/ephy-web-process-extension-proxy.h
new file mode 100644
index 000000000..6727555ae
--- /dev/null
+++ b/embed/ephy-web-process-extension-proxy.h
@@ -0,0 +1,54 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Copyright © 2014 Igalia S.L.
+ *
+ * This file is part of Epiphany.
+ *
+ * Epiphany is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Epiphany is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_WEB_PROCESS_EXTENSION_PROXY (ephy_web_process_extension_proxy_get_type ())
+
+G_DECLARE_FINAL_TYPE (EphyWebProcessExtensionProxy, ephy_web_process_extension_proxy, EPHY,
WEB_PROCESS_EXTENSION_PROXY, GObject)
+
+EphyWebProcessExtensionProxy *ephy_web_process_extension_proxy_new
(GDBusConnection *connection);
+void ephy_web_process_extension_proxy_history_set_urls
(EphyWebProcessExtensionProxy *web_process_extension,
+ GList
*urls);
+void ephy_web_process_extension_proxy_history_set_url_thumbnail
(EphyWebProcessExtensionProxy *web_process_extension,
+ const char
*url,
+ const char
*path);
+void ephy_web_process_extension_proxy_history_set_url_title
(EphyWebProcessExtensionProxy *web_process_extension,
+ const char
*url,
+ const char
*title);
+void ephy_web_process_extension_proxy_history_delete_url
(EphyWebProcessExtensionProxy *web_process_extension,
+ const char
*url);
+void ephy_web_process_extension_proxy_history_delete_host
(EphyWebProcessExtensionProxy *web_process_extension,
+ const char
*host);
+void ephy_web_process_extension_proxy_history_clear
(EphyWebProcessExtensionProxy *web_process_extension);
+void ephy_web_process_extension_proxy_password_query_usernames_response
(EphyWebProcessExtensionProxy *web_process_extension,
+ GList
*users,
+ gint32
promise_id,
+ guint64
page_id);
+void ephy_web_process_extension_proxy_password_query_response
(EphyWebProcessExtensionProxy *web_process_extension,
+ const char
*username,
+ const char
*password,
+ gint32
promise_id,
+ guint64
page_id);
+G_END_DECLS
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index cbb3eb9a9..ed76678a2 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -134,8 +134,8 @@ struct _EphyWebView {
EphyWebViewErrorPage error_page;
- /* Web Extension */
- EphyWebExtensionProxy *web_extension;
+ /* Web Process Extension */
+ EphyWebProcessExtensionProxy *web_process_extension;
};
typedef struct {
@@ -907,16 +907,16 @@ allow_unsafe_browsing_cb (EphyEmbedShell *shell,
}
static void
-page_created_cb (EphyEmbedShell *shell,
- guint64 page_id,
- EphyWebExtensionProxy *web_extension,
- EphyWebView *view)
+page_created_cb (EphyEmbedShell *shell,
+ guint64 page_id,
+ EphyWebProcessExtensionProxy *web_process_extension,
+ EphyWebView *view)
{
if (webkit_web_view_get_page_id (WEBKIT_WEB_VIEW (view)) != page_id)
return;
- view->web_extension = web_extension;
- g_object_add_weak_pointer (G_OBJECT (view->web_extension), (gpointer *)&view->web_extension);
+ view->web_process_extension = web_process_extension;
+ g_object_add_weak_pointer (G_OBJECT (view->web_process_extension), (gpointer
*)&view->web_process_extension);
g_signal_connect_object (shell, "password-form-focused",
G_CALLBACK (password_form_focused_cb),
@@ -936,9 +936,9 @@ ephy_web_view_dispose (GObject *object)
{
EphyWebView *view = EPHY_WEB_VIEW (object);
- if (view->web_extension) {
- g_object_remove_weak_pointer (G_OBJECT (view->web_extension), (gpointer *)&view->web_extension);
- view->web_extension = NULL;
+ if (view->web_process_extension) {
+ g_object_remove_weak_pointer (G_OBJECT (view->web_process_extension), (gpointer
*)&view->web_process_extension);
+ view->web_process_extension = NULL;
}
untrack_info_bar (&view->geolocation_info_bar);
@@ -3949,10 +3949,10 @@ ephy_web_view_get_reader_mode_state (EphyWebView *view)
return view->reader_active;
}
-EphyWebExtensionProxy *
-ephy_web_view_get_web_extension_proxy (EphyWebView *view)
+EphyWebProcessExtensionProxy *
+ephy_web_view_get_web_process_extension_proxy (EphyWebView *view)
{
- return view->web_extension;
+ return view->web_process_extension;
}
gboolean
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 1c490ec7f..751166547 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -26,7 +26,7 @@
#include "ephy-embed-shell.h"
#include "ephy-history-types.h"
#include "ephy-security-levels.h"
-#include "ephy-web-extension-proxy.h"
+#include "ephy-web-process-extension-proxy.h"
G_BEGIN_DECLS
@@ -165,7 +165,7 @@ gboolean ephy_web_view_get_reader_mode_state (EphyWebView
gboolean ephy_web_view_is_in_auth_dialog (EphyWebView *view);
-EphyWebExtensionProxy *ephy_web_view_get_web_extension_proxy (EphyWebView *view);
+EphyWebProcessExtensionProxy *ephy_web_view_get_web_process_extension_proxy (EphyWebView
*view);
void ephy_web_view_show_auth_form_save_request (EphyWebView
*web_view,
const char *origin,
diff --git a/embed/meson.build b/embed/meson.build
index 0f5dcc741..8cb1911f8 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -1,4 +1,4 @@
-subdir('web-extension')
+subdir('web-process-extension')
types_headers = [
'ephy-download.h',
@@ -28,7 +28,7 @@ libephyembed_sources = [
'ephy-find-toolbar.c',
'ephy-view-source-handler.c',
'ephy-web-view.c',
- 'ephy-web-extension-proxy.c',
+ 'ephy-web-process-extension-proxy.c',
enums
]
diff --git a/embed/web-extension/ephy-uri-tester.c b/embed/web-process-extension/ephy-uri-tester.c
similarity index 98%
rename from embed/web-extension/ephy-uri-tester.c
rename to embed/web-process-extension/ephy-uri-tester.c
index 87e0e9dcd..21acc69ab 100644
--- a/embed/web-extension/ephy-uri-tester.c
+++ b/embed/web-process-extension/ephy-uri-tester.c
@@ -599,7 +599,7 @@ ephy_uri_tester_begin_loading_adblock_filters (EphyUriTester *tester,
{
g_auto(GStrv) filters;
- filters = g_settings_get_strv (EPHY_SETTINGS_WEB_EXTENSION_MAIN, EPHY_PREFS_ADBLOCK_FILTERS);
+ filters = g_settings_get_strv (EPHY_SETTINGS_WEB_PROCESS_EXTENSION_MAIN, EPHY_PREFS_ADBLOCK_FILTERS);
tester->adblock_filters_to_load = g_strv_length (filters);
for (guint i = 0; filters[i]; i++) {
g_autoptr(GFile) filter_file = NULL;
@@ -814,7 +814,7 @@ ephy_uri_tester_load (EphyUriTester *tester)
g_assert (EPHY_IS_URI_TESTER (tester));
- if (!g_settings_get_boolean (EPHY_SETTINGS_WEB_EXTENSION_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK))
+ if (!g_settings_get_boolean (EPHY_SETTINGS_WEB_PROCESS_EXTENSION_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK))
tester->adblock_loaded = TRUE;
if (tester->adblock_loaded)
@@ -832,6 +832,6 @@ ephy_uri_tester_load (EphyUriTester *tester)
G_CALLBACK (ephy_uri_tester_enable_adblock_changed_cb), tester);
/* GSettings never emits the changed signal until after we read the setting
* the first time after connecting the handler... work around this.*/
- trash = g_settings_get_strv (EPHY_SETTINGS_WEB_EXTENSION_MAIN, EPHY_PREFS_ADBLOCK_FILTERS);
+ trash = g_settings_get_strv (EPHY_SETTINGS_WEB_PROCESS_EXTENSION_MAIN, EPHY_PREFS_ADBLOCK_FILTERS);
g_strfreev (trash);
}
diff --git a/embed/web-extension/ephy-uri-tester.h b/embed/web-process-extension/ephy-uri-tester.h
similarity index 100%
rename from embed/web-extension/ephy-uri-tester.h
rename to embed/web-process-extension/ephy-uri-tester.h
diff --git a/embed/web-extension/ephy-web-overview-model.c
b/embed/web-process-extension/ephy-web-overview-model.c
similarity index 100%
rename from embed/web-extension/ephy-web-overview-model.c
rename to embed/web-process-extension/ephy-web-overview-model.c
diff --git a/embed/web-extension/ephy-web-overview-model.h
b/embed/web-process-extension/ephy-web-overview-model.h
similarity index 100%
rename from embed/web-extension/ephy-web-overview-model.h
rename to embed/web-process-extension/ephy-web-overview-model.h
diff --git a/embed/web-extension/ephy-web-extension-main.c
b/embed/web-process-extension/ephy-web-process-extension-main.c
similarity index 70%
rename from embed/web-extension/ephy-web-extension-main.c
rename to embed/web-process-extension/ephy-web-process-extension-main.c
index 09f9e945f..824c28db5 100644
--- a/embed/web-extension/ephy-web-extension-main.c
+++ b/embed/web-process-extension/ephy-web-process-extension-main.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include "ephy-web-extension.h"
+#include "ephy-web-process-extension.h"
#include "ephy-debug.h"
#include "ephy-file-helpers.h"
#include "ephy-settings.h"
@@ -28,11 +28,11 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-static EphyWebExtension *extension = NULL;
+static EphyWebProcessExtension *extension = NULL;
G_MODULE_EXPORT void
-webkit_web_extension_initialize_with_user_data (WebKitWebExtension *webkit_extension,
- GVariant *user_data)
+webkit_web_process_extension_initialize_with_user_data (WebKitWebExtension *webkit_extension,
+ GVariant *user_data)
{
const char *guid;
const char *server_address;
@@ -54,19 +54,19 @@ webkit_web_extension_initialize_with_user_data (WebKitWebExtension *webkit_exten
ephy_debug_init ();
- extension = ephy_web_extension_get ();
+ extension = ephy_web_process_extension_get ();
- ephy_web_extension_initialize (extension,
- webkit_extension,
- guid,
- server_address,
- adblock_data_dir,
- private_profile,
- browser_mode);
+ ephy_web_process_extension_initialize (extension,
+ webkit_extension,
+ guid,
+ server_address,
+ adblock_data_dir,
+ private_profile,
+ browser_mode);
}
static void __attribute__((destructor))
-ephy_web_extension_shutdown (void)
+ephy_web_process_extension_shutdown (void)
{
if (extension)
g_object_unref (extension);
diff --git a/embed/web-extension/ephy-web-extension.c
b/embed/web-process-extension/ephy-web-process-extension.c
similarity index 82%
rename from embed/web-extension/ephy-web-extension.c
rename to embed/web-process-extension/ephy-web-process-extension.c
index 88367b458..649372a70 100644
--- a/embed/web-extension/ephy-web-extension.c
+++ b/embed/web-process-extension/ephy-web-process-extension.c
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "ephy-web-extension.h"
+#include "ephy-web-process-extension.h"
#include "ephy-dbus-names.h"
#include "ephy-dbus-util.h"
@@ -42,7 +42,7 @@
#include <webkit2/webkit-web-extension.h>
#include <JavaScriptCore/JavaScript.h>
-struct _EphyWebExtension {
+struct _EphyWebProcessExtension {
GObject parent_instance;
WebKitWebExtension *extension;
@@ -62,7 +62,7 @@ struct _EphyWebExtension {
static const char introspection_xml[] =
"<node>"
- " <interface name='org.gnome.Epiphany.WebExtension'>"
+ " <interface name='org.gnome.Epiphany.WebProcessExtension'>"
" <signal name='PageCreated'>"
" <arg type='t' name='page_id' direction='out'/>"
" </signal>"
@@ -98,12 +98,12 @@ static const char introspection_xml[] =
" </interface>"
"</node>";
-G_DEFINE_TYPE (EphyWebExtension, ephy_web_extension, G_TYPE_OBJECT)
+G_DEFINE_TYPE (EphyWebProcessExtension, ephy_web_process_extension, G_TYPE_OBJECT)
static void
-log_to_js_console (EphyWebExtension *extension,
- WebKitWebPage *page,
- const char *str,
+log_to_js_console (EphyWebProcessExtension *extension,
+ WebKitWebPage *page,
+ const char *str,
...)
{
g_autoptr(JSCContext) js_context = NULL;
@@ -129,10 +129,10 @@ log_to_js_console (EphyWebExtension *extension,
}
static gboolean
-should_use_adblocker (const char *request_uri,
- const char *page_uri,
- const char *redirected_request_uri,
- EphyWebExtension *extension)
+should_use_adblocker (const char *request_uri,
+ const char *page_uri,
+ const char *redirected_request_uri,
+ EphyWebProcessExtension *extension)
{
g_autofree gchar *origin = ephy_uri_to_security_origin (page_uri);
EphyPermission permission = EPHY_PERMISSION_UNDECIDED;
@@ -146,7 +146,7 @@ should_use_adblocker (const char *request_uri,
return FALSE;
}
- if (permission == EPHY_PERMISSION_UNDECIDED && !g_settings_get_boolean (EPHY_SETTINGS_WEB_EXTENSION_WEB,
EPHY_PREFS_WEB_ENABLE_ADBLOCK))
+ if (permission == EPHY_PERMISSION_UNDECIDED && !g_settings_get_boolean
(EPHY_SETTINGS_WEB_PROCESS_EXTENSION_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK))
return FALSE;
/* Always load the main resource... */
@@ -179,10 +179,10 @@ should_use_adblocker (const char *request_uri,
}
static gboolean
-web_page_send_request (WebKitWebPage *web_page,
- WebKitURIRequest *request,
- WebKitURIResponse *redirected_response,
- EphyWebExtension *extension)
+web_page_send_request (WebKitWebPage *web_page,
+ WebKitURIRequest *request,
+ WebKitURIResponse *redirected_response,
+ EphyWebProcessExtension *extension)
{
const char *request_uri;
const char *redirected_response_uri;
@@ -193,7 +193,7 @@ web_page_send_request (WebKitWebPage *web_page,
page_uri = webkit_web_page_get_uri (web_page);
redirected_response_uri = redirected_response ? webkit_uri_response_get_uri (redirected_response) : NULL;
- if (g_settings_get_boolean (EPHY_SETTINGS_WEB_EXTENSION_WEB, EPHY_PREFS_WEB_DO_NOT_TRACK))
+ if (g_settings_get_boolean (EPHY_SETTINGS_WEB_PROCESS_EXTENSION_WEB, EPHY_PREFS_WEB_DO_NOT_TRACK))
modified_uri = ephy_remove_tracking_from_uri (request_uri);
if (should_use_adblocker (request_uri, page_uri, redirected_response_uri, extension)) {
@@ -222,7 +222,7 @@ web_page_will_submit_form (WebKitWebPage *web_page,
GPtrArray *text_field_names,
GPtrArray *text_field_values)
{
- EphyWebExtension *extension;
+ EphyWebProcessExtension *extension;
gboolean form_submit_handled;
g_autoptr(JSCContext) js_context = NULL;
g_autoptr(JSCValue) js_ephy = NULL;
@@ -239,7 +239,7 @@ web_page_will_submit_form (WebKitWebPage *web_page,
"ephy-form-submit-handled",
GINT_TO_POINTER (TRUE));
- extension = ephy_web_extension_get ();
+ extension = ephy_web_process_extension_get ();
js_context = webkit_frame_get_js_context_for_script_world (source_frame, extension->script_world);
js_ephy = jsc_context_get_value (js_context, "Ephy");
js_form = webkit_frame_get_js_value_for_dom_object_in_script_world (frame, WEBKIT_DOM_OBJECT (dom_form),
extension->script_world);
@@ -265,9 +265,9 @@ password_form_message_serializer (guint64 page_id,
}
static void
-web_page_form_controls_associated (WebKitWebPage *web_page,
- GPtrArray *elements,
- EphyWebExtension *extension)
+web_page_form_controls_associated (WebKitWebPage *web_page,
+ GPtrArray *elements,
+ EphyWebProcessExtension *extension)
{
WebKitFrame *frame;
g_autoptr(GPtrArray) form_controls = NULL;
@@ -307,14 +307,14 @@ web_page_context_menu (WebKitWebPage *web_page,
WebKitWebHitTestResult *hit_test_result,
gpointer user_data)
{
- EphyWebExtension *extension;
+ EphyWebProcessExtension *extension;
g_autofree char *string = NULL;
GVariantBuilder builder;
WebKitFrame *frame;
g_autoptr(JSCContext) js_context = NULL;
g_autoptr(JSCValue) js_value = NULL;
- extension = ephy_web_extension_get ();
+ extension = ephy_web_process_extension_get ();
frame = webkit_web_page_get_main_frame (web_page);
js_context = webkit_frame_get_js_context_for_script_world (frame, extension->script_world);
@@ -334,15 +334,15 @@ web_page_context_menu (WebKitWebPage *web_page,
}
static void
-ephy_web_extension_emit_page_created (EphyWebExtension *extension,
- guint64 page_id)
+ephy_web_process_extension_emit_page_created (EphyWebProcessExtension *extension,
+ guint64 page_id)
{
g_autoptr(GError) error = NULL;
g_dbus_connection_emit_signal (extension->dbus_connection,
NULL,
- EPHY_WEB_EXTENSION_OBJECT_PATH,
- EPHY_WEB_EXTENSION_INTERFACE,
+ EPHY_WEB_PROCESS_EXTENSION_OBJECT_PATH,
+ EPHY_WEB_PROCESS_EXTENSION_INTERFACE,
"PageCreated",
g_variant_new ("(t)", page_id),
&error);
@@ -351,7 +351,7 @@ ephy_web_extension_emit_page_created (EphyWebExtension *extension,
}
static void
-ephy_web_extension_emit_page_created_signals_pending (EphyWebExtension *extension)
+ephy_web_process_extension_emit_page_created_signals_pending (EphyWebProcessExtension *extension)
{
guint i;
@@ -362,7 +362,7 @@ ephy_web_extension_emit_page_created_signals_pending (EphyWebExtension *extensio
guint64 page_id;
page_id = g_array_index (extension->page_created_signals_pending, guint64, i);
- ephy_web_extension_emit_page_created (extension, page_id);
+ ephy_web_process_extension_emit_page_created (extension, page_id);
}
g_array_free (extension->page_created_signals_pending, TRUE);
@@ -370,8 +370,8 @@ ephy_web_extension_emit_page_created_signals_pending (EphyWebExtension *extensio
}
static void
-ephy_web_extension_queue_page_created_signal_emission (EphyWebExtension *extension,
- guint64 page_id)
+ephy_web_process_extension_queue_page_created_signal_emission (EphyWebProcessExtension *extension,
+ guint64 page_id)
{
if (!extension->page_created_signals_pending)
extension->page_created_signals_pending = g_array_new (FALSE, FALSE, sizeof (guint64));
@@ -379,8 +379,8 @@ ephy_web_extension_queue_page_created_signal_emission (EphyWebExtension *extensi
}
static void
-ephy_web_extension_page_created_cb (EphyWebExtension *extension,
- WebKitWebPage *web_page)
+ephy_web_process_extension_page_created_cb (EphyWebProcessExtension *extension,
+ WebKitWebPage *web_page)
{
guint64 page_id;
g_autoptr(JSCContext) js_context = NULL;
@@ -390,9 +390,9 @@ ephy_web_extension_page_created_cb (EphyWebExtension *extension,
page_id = webkit_web_page_get_id (web_page);
if (extension->dbus_connection)
- ephy_web_extension_emit_page_created (extension, page_id);
+ ephy_web_process_extension_emit_page_created (extension, page_id);
else
- ephy_web_extension_queue_page_created_signal_emission (extension, page_id);
+ ephy_web_process_extension_queue_page_created_signal_emission (extension, page_id);
g_signal_connect (web_page, "send-request",
G_CALLBACK (web_page_send_request),
@@ -409,7 +409,8 @@ ephy_web_extension_page_created_cb (EphyWebExtension *extension,
}
static JSCValue *
-get_password_manager (EphyWebExtension *self, guint64 page_id)
+get_password_manager (EphyWebProcessExtension *self,
+ guint64 page_id)
{
WebKitWebPage *page;
WebKitFrame *frame;
@@ -437,9 +438,9 @@ handle_method_call (GDBusConnection *connection,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
- EphyWebExtension *extension = EPHY_WEB_EXTENSION (user_data);
+ EphyWebProcessExtension *extension = EPHY_WEB_PROCESS_EXTENSION (user_data);
- if (g_strcmp0 (interface_name, EPHY_WEB_EXTENSION_INTERFACE) != 0)
+ if (g_strcmp0 (interface_name, EPHY_WEB_PROCESS_EXTENSION_INTERFACE) != 0)
return;
if (g_strcmp0 (method_name, "HistorySetURLs") == 0) {
@@ -537,9 +538,9 @@ static const GDBusInterfaceVTable interface_vtable = {
};
static void
-ephy_web_extension_dispose (GObject *object)
+ephy_web_process_extension_dispose (GObject *object)
{
- EphyWebExtension *extension = EPHY_WEB_EXTENSION (object);
+ EphyWebProcessExtension *extension = EPHY_WEB_PROCESS_EXTENSION (object);
g_clear_object (&extension->uri_tester);
g_clear_object (&extension->overview_model);
@@ -554,40 +555,40 @@ ephy_web_extension_dispose (GObject *object)
g_clear_object (&extension->dbus_connection);
g_clear_object (&extension->extension);
- G_OBJECT_CLASS (ephy_web_extension_parent_class)->dispose (object);
+ G_OBJECT_CLASS (ephy_web_process_extension_parent_class)->dispose (object);
}
static void
-ephy_web_extension_class_init (EphyWebExtensionClass *klass)
+ephy_web_process_extension_class_init (EphyWebProcessExtensionClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->dispose = ephy_web_extension_dispose;
+ object_class->dispose = ephy_web_process_extension_dispose;
}
static void
-ephy_web_extension_init (EphyWebExtension *extension)
+ephy_web_process_extension_init (EphyWebProcessExtension *extension)
{
extension->overview_model = ephy_web_overview_model_new ();
}
static gpointer
-ephy_web_extension_create_instance (gpointer data)
+ephy_web_process_extension_create_instance (gpointer data)
{
- return g_object_new (EPHY_TYPE_WEB_EXTENSION, NULL);
+ return g_object_new (EPHY_TYPE_WEB_PROCESS_EXTENSION, NULL);
}
-EphyWebExtension *
-ephy_web_extension_get (void)
+EphyWebProcessExtension *
+ephy_web_process_extension_get (void)
{
static GOnce once_init = G_ONCE_INIT;
- return EPHY_WEB_EXTENSION (g_once (&once_init, ephy_web_extension_create_instance, NULL));
+ return EPHY_WEB_PROCESS_EXTENSION (g_once (&once_init, ephy_web_process_extension_create_instance, NULL));
}
static void
-dbus_connection_created_cb (GObject *source_object,
- GAsyncResult *result,
- EphyWebExtension *extension)
+dbus_connection_created_cb (GObject *source_object,
+ GAsyncResult *result,
+ EphyWebProcessExtension *extension)
{
static GDBusNodeInfo *introspection_data = NULL;
g_autoptr(GDBusConnection) connection = NULL;
@@ -605,26 +606,26 @@ dbus_connection_created_cb (GObject *source_object,
registration_id =
g_dbus_connection_register_object (connection,
- EPHY_WEB_EXTENSION_OBJECT_PATH,
+ EPHY_WEB_PROCESS_EXTENSION_OBJECT_PATH,
introspection_data->interfaces[0],
&interface_vtable,
extension,
NULL,
&error);
if (!registration_id) {
- g_warning ("Failed to register web extension object: %s\n", error->message);
+ g_warning ("Failed to register web process extension object: %s\n", error->message);
return;
}
extension->dbus_connection = g_steal_pointer (&connection);
- ephy_web_extension_emit_page_created_signals_pending (extension);
+ ephy_web_process_extension_emit_page_created_signals_pending (extension);
}
static gboolean
-authorize_authenticated_peer_cb (GDBusAuthObserver *observer,
- GIOStream *stream,
- GCredentials *credentials,
- EphyWebExtension *extension)
+authorize_authenticated_peer_cb (GDBusAuthObserver *observer,
+ GIOStream *stream,
+ GCredentials *credentials,
+ EphyWebProcessExtension *extension)
{
return ephy_dbus_peer_is_authorized (credentials);
}
@@ -670,11 +671,11 @@ js_is_edited (JSCValue *js_element)
}
static gboolean
-js_should_remember_passwords (EphyWebExtension *extension)
+js_should_remember_passwords (EphyWebProcessExtension *extension)
{
- g_assert (EPHY_IS_WEB_EXTENSION (extension));
+ g_assert (EPHY_IS_WEB_PROCESS_EXTENSION (extension));
- return !extension->is_private_profile && g_settings_get_boolean (EPHY_SETTINGS_WEB_EXTENSION_WEB,
EPHY_PREFS_WEB_REMEMBER_PASSWORDS);
+ return !extension->is_private_profile && g_settings_get_boolean (EPHY_SETTINGS_WEB_PROCESS_EXTENSION_WEB,
EPHY_PREFS_WEB_REMEMBER_PASSWORDS);
}
static void
@@ -694,10 +695,10 @@ js_exception_handler (JSCContext *context,
}
static void
-window_object_cleared_cb (WebKitScriptWorld *world,
- WebKitWebPage *page,
- WebKitFrame *frame,
- EphyWebExtension *extension)
+window_object_cleared_cb (WebKitScriptWorld *world,
+ WebKitWebPage *page,
+ WebKitFrame *frame,
+ EphyWebProcessExtension *extension)
{
JSCContext *js_context;
g_autoptr(GBytes) bytes = NULL;
@@ -713,9 +714,9 @@ window_object_cleared_cb (WebKitScriptWorld *world,
js_context = webkit_frame_get_js_context_for_script_world (frame, world);
jsc_context_push_exception_handler (js_context, (JSCExceptionHandler)js_exception_handler, NULL, NULL);
- bytes = g_resources_lookup_data ("/org/gnome/epiphany-web-extension/js/ephy.js",
G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
+ bytes = g_resources_lookup_data ("/org/gnome/epiphany-web-process-extension/js/ephy.js",
G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
data = g_bytes_get_data (bytes, &data_size);
- result = jsc_context_evaluate_with_source_uri (js_context, data, data_size,
"resource:///org/gnome/epiphany-web-extension/js/ephy.js", 1);
+ result = jsc_context_evaluate_with_source_uri (js_context, data, data_size,
"resource:///org/gnome/epiphany-web-process-extension/js/ephy.js", 1);
g_clear_pointer (&bytes, g_bytes_unref);
g_clear_object (&result);
@@ -742,9 +743,9 @@ window_object_cleared_cb (WebKitScriptWorld *world,
g_autoptr(JSCValue) js_overview_ctor = NULL;
g_autoptr(JSCValue) jsc_overview_model = NULL;
- bytes = g_resources_lookup_data ("/org/gnome/epiphany-web-extension/js/overview.js",
G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
+ bytes = g_resources_lookup_data ("/org/gnome/epiphany-web-process-extension/js/overview.js",
G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
data = g_bytes_get_data (bytes, &data_size);
- result = jsc_context_evaluate_with_source_uri (js_context, data, data_size,
"resource:///org/gnome/epiphany-web-extension/js/overview.js", 1);
+ result = jsc_context_evaluate_with_source_uri (js_context, data, data_size,
"resource:///org/gnome/epiphany-web-process-extension/js/overview.js", 1);
g_clear_pointer (&bytes, g_bytes_unref);
g_clear_object (&result);
@@ -803,17 +804,17 @@ window_object_cleared_cb (WebKitScriptWorld *world,
}
void
-ephy_web_extension_initialize (EphyWebExtension *extension,
- WebKitWebExtension *wk_extension,
- const char *guid,
- const char *server_address,
- const char *adblock_data_dir,
- gboolean is_private_profile,
- gboolean is_browser_mode)
+ephy_web_process_extension_initialize (EphyWebProcessExtension *extension,
+ WebKitWebExtension *wk_extension,
+ const char *guid,
+ const char *server_address,
+ const char *adblock_data_dir,
+ gboolean is_private_profile,
+ gboolean is_browser_mode)
{
g_autoptr(GDBusAuthObserver) observer = NULL;
- g_assert (EPHY_IS_WEB_EXTENSION (extension));
+ g_assert (EPHY_IS_WEB_PROCESS_EXTENSION (extension));
if (extension->initialized)
return;
@@ -833,7 +834,7 @@ ephy_web_extension_initialize (EphyWebExtension *extension,
extension->permissions_manager = ephy_permissions_manager_new ();
g_signal_connect_swapped (extension->extension, "page-created",
- G_CALLBACK (ephy_web_extension_page_created_cb),
+ G_CALLBACK (ephy_web_process_extension_page_created_cb),
extension);
observer = g_dbus_auth_observer_new ();
diff --git a/embed/web-process-extension/ephy-web-process-extension.h
b/embed/web-process-extension/ephy-web-process-extension.h
new file mode 100644
index 000000000..9463a96f0
--- /dev/null
+++ b/embed/web-process-extension/ephy-web-process-extension.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * Copyright © 2014 Igalia S.L.
+ *
+ * This file is part of Epiphany.
+ *
+ * Epiphany is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Epiphany is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <glib-object.h>
+#include <webkit2/webkit-web-extension.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_WEB_PROCESS_EXTENSION (ephy_web_process_extension_get_type())
+
+G_DECLARE_FINAL_TYPE (EphyWebProcessExtension, ephy_web_process_extension, EPHY, WEB_PROCESS_EXTENSION,
GObject)
+
+EphyWebProcessExtension *ephy_web_process_extension_get (void);
+void ephy_web_process_extension_initialize (EphyWebProcessExtension *extension,
+ WebKitWebExtension *wk_extension,
+ const char *guid,
+ const char *server_address,
+ const char *adblock_data_dir,
+ gboolean is_private_profile,
+ gboolean is_browser_mode);
+
+G_END_DECLS
diff --git a/embed/web-process-extension/meson.build b/embed/web-process-extension/meson.build
new file mode 100644
index 000000000..4634cdebf
--- /dev/null
+++ b/embed/web-process-extension/meson.build
@@ -0,0 +1,28 @@
+resource_files = files('resources/epiphany-web-process-extension.gresource.xml')
+resources = gnome.compile_resources('epiphany-web-process-extension-resources',
+ resource_files,
+ c_name: 'epiphany_web_process_extension',
+ source_dir: 'resources'
+)
+
+web_process_extension_sources = [
+ 'ephy-uri-tester.c',
+ 'ephy-web-process-extension.c',
+ 'ephy-web-process-extension-main.c',
+ 'ephy-web-overview-model.c',
+ resources
+]
+
+web_process_extension_deps = [
+ ephymisc_dep,
+ ephysync_dep,
+ webkit2gtk_web_extension_dep
+]
+
+shared_module('ephywebprocessextension',
+ web_process_extension_sources,
+ dependencies: web_process_extension_deps,
+ install: true,
+ install_dir: webprocessextensionsdir,
+ install_rpath: pkglibdir
+)
diff --git a/embed/web-extension/resources/epiphany-web-extension.gresource.xml
b/embed/web-process-extension/resources/epiphany-web-process-extension.gresource.xml
similarity index 73%
rename from embed/web-extension/resources/epiphany-web-extension.gresource.xml
rename to embed/web-process-extension/resources/epiphany-web-process-extension.gresource.xml
index 97166cfb0..5c0d16f59 100644
--- a/embed/web-extension/resources/epiphany-web-extension.gresource.xml
+++ b/embed/web-process-extension/resources/epiphany-web-process-extension.gresource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnome/epiphany-web-extension">
+ <gresource prefix="/org/gnome/epiphany-web-process-extension">
<file compressed="true">js/ephy.js</file>
<file compressed="true">js/overview.js</file>
</gresource>
diff --git a/embed/web-extension/resources/js/ephy.js b/embed/web-process-extension/resources/js/ephy.js
similarity index 100%
rename from embed/web-extension/resources/js/ephy.js
rename to embed/web-process-extension/resources/js/ephy.js
diff --git a/embed/web-extension/resources/js/overview.js
b/embed/web-process-extension/resources/js/overview.js
similarity index 100%
rename from embed/web-extension/resources/js/overview.js
rename to embed/web-process-extension/resources/js/overview.js
diff --git a/lib/ephy-dbus-names.h b/lib/ephy-dbus-names.h
index b051f44b1..80b357517 100644
--- a/lib/ephy-dbus-names.h
+++ b/lib/ephy-dbus-names.h
@@ -22,8 +22,8 @@
G_BEGIN_DECLS
-#define EPHY_WEB_EXTENSION_SERVICE_NAME "org.gnome.Epiphany.WebExtension"
-#define EPHY_WEB_EXTENSION_OBJECT_PATH "/org/gnome/Epiphany/WebExtension"
-#define EPHY_WEB_EXTENSION_INTERFACE "org.gnome.Epiphany.WebExtension"
+#define EPHY_WEB_PROCESS_EXTENSION_SERVICE_NAME "org.gnome.Epiphany.WebProcessExtension"
+#define EPHY_WEB_PROCESS_EXTENSION_OBJECT_PATH "/org/gnome/Epiphany/WebProcessExtension"
+#define EPHY_WEB_PROCESS_EXTENSION_INTERFACE "org.gnome.Epiphany.WebProcessExtension"
G_END_DECLS
diff --git a/lib/ephy-settings.h b/lib/ephy-settings.h
index 5c95f70d2..c2b98dd0c 100644
--- a/lib/ephy-settings.h
+++ b/lib/ephy-settings.h
@@ -27,19 +27,19 @@
G_BEGIN_DECLS
-#define EPHY_SETTINGS_MAIN ephy_settings_get (EPHY_PREFS_SCHEMA)
-#define EPHY_SETTINGS_UI ephy_settings_get (EPHY_PREFS_UI_SCHEMA)
-#define EPHY_SETTINGS_WEB ephy_settings_get (EPHY_PREFS_WEB_SCHEMA)
-#define EPHY_SETTINGS_LOCKDOWN ephy_settings_get (EPHY_PREFS_LOCKDOWN_SCHEMA)
-#define EPHY_SETTINGS_STATE ephy_settings_get (EPHY_PREFS_STATE_SCHEMA)
-#define EPHY_SETTINGS_SYNC ephy_settings_get (EPHY_PREFS_SYNC_SCHEMA)
-#define EPHY_SETTINGS_WEB_APP ephy_settings_get (EPHY_PREFS_WEB_APP_SCHEMA)
-#define EPHY_SETTINGS_READER ephy_settings_get (EPHY_PREFS_READER_SCHEMA)
-#define EPHY_SETTINGS_WEB_EXTENSION_MAIN ephy_settings_get_for_web_extension (EPHY_PREFS_SCHEMA)
-#define EPHY_SETTINGS_WEB_EXTENSION_WEB ephy_settings_get_for_web_extension (EPHY_PREFS_WEB_SCHEMA)
+#define EPHY_SETTINGS_MAIN ephy_settings_get (EPHY_PREFS_SCHEMA)
+#define EPHY_SETTINGS_UI ephy_settings_get (EPHY_PREFS_UI_SCHEMA)
+#define EPHY_SETTINGS_WEB ephy_settings_get (EPHY_PREFS_WEB_SCHEMA)
+#define EPHY_SETTINGS_LOCKDOWN ephy_settings_get (EPHY_PREFS_LOCKDOWN_SCHEMA)
+#define EPHY_SETTINGS_STATE ephy_settings_get (EPHY_PREFS_STATE_SCHEMA)
+#define EPHY_SETTINGS_SYNC ephy_settings_get (EPHY_PREFS_SYNC_SCHEMA)
+#define EPHY_SETTINGS_WEB_APP ephy_settings_get (EPHY_PREFS_WEB_APP_SCHEMA)
+#define EPHY_SETTINGS_READER ephy_settings_get (EPHY_PREFS_READER_SCHEMA)
+#define EPHY_SETTINGS_WEB_PROCESS_EXTENSION_MAIN ephy_settings_get_for_web_process_extension
(EPHY_PREFS_SCHEMA)
+#define EPHY_SETTINGS_WEB_PROCESS_EXTENSION_WEB ephy_settings_get_for_web_process_extension
(EPHY_PREFS_WEB_SCHEMA)
GSettings *ephy_settings_get (const char *schema);
-GSettings *ephy_settings_get_for_web_extension (const char *schema);
+GSettings *ephy_settings_get_for_web_process_extension (const char *schema);
void ephy_settings_shutdown (void);
diff --git a/meson.build b/meson.build
index 359ccbf62..b7af3b426 100644
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,7 @@ pkgdatadir = join_paths(datadir, 'epiphany')
pkglibdir = join_paths(libdir, 'epiphany')
pkglibexecdir = join_paths(libexecdir, 'epiphany')
servicedir = join_paths(datadir, 'dbus-1', 'services')
-webextensionsdir = join_paths(pkglibdir, 'web-extensions')
+webprocessextensionsdir = join_paths(pkglibdir, 'web-process-extensions')
iso_codes = dependency('iso-codes')
iso_codes_prefix = iso_codes.get_pkgconfig_variable('prefix')
@@ -45,7 +45,7 @@ conf.set_quoted('BUILD_ROOT', meson.build_root())
developer_mode = get_option('developer_mode')
conf.set10('DEVELOPER_MODE', developer_mode)
conf.set_quoted('DISTRIBUTOR_NAME', distributor_name)
-conf.set_quoted('EPHY_WEB_EXTENSIONS_DIR', webextensionsdir)
+conf.set_quoted('EPHY_WEB_PROCESS_EXTENSIONS_DIR', webprocessextensionsdir)
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('ISO_CODES_PREFIX', iso_codes_prefix)
conf.set_quoted('LIBLOCALEDIR', liblocaledir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
