aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/Makefile.am2
-rw-r--r--embed/ephy-adblock-manager.c2
-rw-r--r--embed/ephy-adblock-manager.h2
-rw-r--r--embed/ephy-adblock.c75
-rw-r--r--embed/ephy-adblock.h90
-rw-r--r--embed/mozilla/EphyContentPolicy.cpp19
6 files changed, 181 insertions, 9 deletions
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 26ef039ea..d92b27c00 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -16,6 +16,7 @@ NOINST_H_FILES = \
ephy-favicon-cache.h
INST_H_FILES = \
+ ephy-adblock.h \
ephy-adblock-manager.h \
ephy-command-manager.h \
ephy-cookie-manager.h \
@@ -35,6 +36,7 @@ BUILT_SOURCES = \
ephy-embed-type-builtins.h
libephyembed_la_SOURCES = \
+ ephy-adblock.c \
ephy-adblock-manager.c \
downloader-view.c \
ephy-command-manager.c \
diff --git a/embed/ephy-adblock-manager.c b/embed/ephy-adblock-manager.c
index dd627fddf..dacf7c8da 100644
--- a/embed/ephy-adblock-manager.c
+++ b/embed/ephy-adblock-manager.c
@@ -66,12 +66,14 @@ ephy_adblock_manager_set_blocker (EphyAdBlockManager *self,
**/
gboolean
ephy_adblock_manager_should_load (EphyAdBlockManager *self,
+ EphyEmbed *embed,
const char *url,
AdUriCheckType check_type)
{
if (self->priv->blocker != NULL)
{
return ephy_adblock_should_load (self->priv->blocker,
+ embed,
url,
check_type);
}
diff --git a/embed/ephy-adblock-manager.h b/embed/ephy-adblock-manager.h
index d6889e39f..d7c8cb95a 100644
--- a/embed/ephy-adblock-manager.h
+++ b/embed/ephy-adblock-manager.h
@@ -24,6 +24,7 @@
#define EPHY_ADBLOCK_MANAGER_H
#include <glib-object.h>
+#include "ephy-embed.h"
#include "ephy-adblock.h"
G_BEGIN_DECLS
@@ -56,6 +57,7 @@ struct _EphyAdBlockManagerClass {
GType ephy_adblock_manager_get_type (void);
gboolean ephy_adblock_manager_should_load (EphyAdBlockManager *self,
+ EphyEmbed *embed,
const char *url,
AdUriCheckType check_type);
diff --git a/embed/ephy-adblock.c b/embed/ephy-adblock.c
new file mode 100644
index 000000000..4f5be6731
--- /dev/null
+++ b/embed/ephy-adblock.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2003 Marco Pesenti Gritti
+ * Copyright © 2003 Christian Persch
+ * Copyright © 2005 Jean-François Rameau
+ *
+ * This program 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 2, or (at your option)
+ * any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
+ */
+
+#include "config.h"
+
+#include "ephy-adblock.h"
+
+GType
+ephy_adblock_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0))
+ {
+ const GTypeInfo our_info =
+ {
+ sizeof (EphyAdBlockIface),
+ NULL,
+ NULL,
+ };
+
+ type = g_type_register_static (G_TYPE_INTERFACE,
+ "EphyAdBlock",
+ &our_info, 0);
+ }
+
+ return type;
+}
+
+gboolean
+ephy_adblock_should_load (EphyAdBlock *adblock,
+ EphyEmbed *embed,
+ const char *url,
+ AdUriCheckType check_type)
+{
+ EphyAdBlockIface *iface = EPHY_ADBLOCK_GET_IFACE (adblock);
+
+ if (iface->should_load)
+ {
+ return iface->should_load (adblock, embed, url, check_type);
+ }
+
+ return TRUE;
+}
+
+void
+ephy_adblock_edit_rule (EphyAdBlock *adblock,
+ const char *url,
+ gboolean allowed)
+{
+ EphyAdBlockIface *iface = EPHY_ADBLOCK_GET_IFACE (adblock);
+ if (iface->edit_rule)
+ {
+ iface->edit_rule (adblock, url, allowed);
+ }
+}
diff --git a/embed/ephy-adblock.h b/embed/ephy-adblock.h
new file mode 100644
index 000000000..693c386b9
--- /dev/null
+++ b/embed/ephy-adblock.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2003 Marco Pesenti Gritti
+ * Copyright © 2003 Christian Persch
+ * Copyright © 2005 Jean-François Rameau
+ *
+ * This program 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 2, or (at your option)
+ * any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
+ */
+
+#ifndef EPHY_ADBLOCK_H
+#define EPHY_ADBLOCK_H
+
+#include "ephy-embed.h"
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define EPHY_TYPE_ADBLOCK (ephy_adblock_get_type ())
+#define EPHY_ADBLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_ADBLOCK, EphyAdBlock))
+#define EPHY_ADBLOCK_IFACE(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_ADBLOCK, EphyAdBlockIface))
+#define EPHY_IS_ADBLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_ADBLOCK))
+#define EPHY_IS_ADBLOCK_IFACE(class) (G_TYPE_CHECK_CLASS_TYPE ((class), EPHY_TYPE_ADBLOCK))
+#define EPHY_ADBLOCK_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_ADBLOCK, EphyAdBlockIface))
+
+typedef enum
+{
+ AD_URI_CHECK_TYPE_OTHER = 1U,
+ AD_URI_CHECK_TYPE_SCRIPT = 2U, /* Indicates an executable script
+ (such as JavaScript) */
+ AD_URI_CHECK_TYPE_IMAGE = 3U, /* Indicates an image (e.g., IMG
+ elements) */
+ AD_URI_CHECK_TYPE_STYLESHEET = 4U, /* Indicates a stylesheet (e.g.,
+ STYLE elements) */
+ AD_URI_CHECK_TYPE_OBJECT = 5U, /* Indicates a generic object
+ (plugin-handled content
+ typically falls under this
+ category) */
+ AD_URI_CHECK_TYPE_DOCUMENT = 6U, /* Indicates a document at the
+ top-level (i.e., in a
+ browser) */
+ AD_URI_CHECK_TYPE_SUBDOCUMENT = 7U, /* Indicates a document contained
+ within another document (e.g.,
+ IFRAMEs, FRAMES, and OBJECTs) */
+ AD_URI_CHECK_TYPE_REFRESH = 8U /* Indicates a timed refresh */
+} AdUriCheckType;
+
+typedef struct _EphyAdBlock EphyAdBlock;
+typedef struct _EphyAdBlockIface EphyAdBlockIface;
+
+struct _EphyAdBlockIface
+{
+ GTypeInterface base_iface;
+
+ gboolean (* should_load) (EphyAdBlock *adblock,
+ EphyEmbed *embed,
+ const char *url,
+ AdUriCheckType check_type);
+
+ void (* edit_rule) (EphyAdBlock *adblock,
+ const char *url,
+ gboolean allowed);
+};
+
+GType ephy_adblock_get_type (void);
+
+gboolean ephy_adblock_should_load (EphyAdBlock *adblock,
+ EphyEmbed *embed,
+ const char *url,
+ AdUriCheckType check_type);
+
+void ephy_adblock_edit_rule (EphyAdBlock *adblock,
+ const char *url,
+ gboolean allowed);
+
+G_END_DECLS
+
+#endif
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index 77a519154..7d55a6971 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -151,22 +151,23 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType,
PR_TRUE /* TYPE_REFRESH */
};
- if (kBlockType[aContentType < G_N_ELEMENTS (kBlockType) ? aContentType : 0] &&
- !ephy_adblock_manager_should_load (adblock_manager,
- contentSpec.get (),
- AdUriCheckType (aContentType)))
+ if (kBlockType[aContentType < G_N_ELEMENTS (kBlockType) ? aContentType : 0])
{
- *aDecision = nsIContentPolicy::REJECT_REQUEST;
-
- GtkWidget *embed = GetEmbedFromContext (aContext);
+ GtkWidget *embed = GetEmbedFromContext (aContext);
- if (embed)
+ if (embed &&
+ !ephy_adblock_manager_should_load (adblock_manager,
+ EPHY_EMBED (embed),
+ contentSpec.get (),
+ AdUriCheckType (aContentType)))
{
+ *aDecision = nsIContentPolicy::REJECT_REQUEST;
+
g_signal_emit_by_name (embed,
"content-blocked",
contentSpec.get ());
+ return NS_OK;
}
- return NS_OK;
}
PRBool isHttp = PR_FALSE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:58:07 +0800