aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-02-26 04:42:36 +0800
committerChristian Persch <chpe@src.gnome.org>2008-02-26 04:42:36 +0800
commitd8cd94758db14e98051db785ab90094e64ece264 (patch)
tree5160d0050115137ebfd1a6523db586c91db8e640
parentfdb56c8ae221e85e843efcdc9ae0b0bb83c0a507 (diff)
downloadgsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.tar
gsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.tar.gz
gsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.tar.bz2
gsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.tar.lz
gsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.tar.xz
gsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.tar.zst
gsoc2013-epiphany-d8cd94758db14e98051db785ab90094e64ece264.zip
Update for added nsIContentPolicy constants in 1.9.
svn path=/trunk/; revision=7984
-rw-r--r--embed/mozilla/EphyContentPolicy.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index f72f2f172..979309751 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -135,7 +135,7 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType,
EphyAdBlockManager *adblock_manager =
EPHY_ADBLOCK_MANAGER (ephy_embed_shell_get_adblock_manager (embed_shell));
- static PRBool kBlockType[nsIContentPolicy::TYPE_REFRESH + 1] = {
+ static PRBool kBlockType[] = {
PR_FALSE /* unused/unknown, don't block */,
PR_TRUE /* TYPE_OTHER */,
PR_TRUE /* TYPE_SCRIPT */,
@@ -144,7 +144,13 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType,
PR_TRUE /* TYPE_OBJECT */,
PR_FALSE /* TYPE_DOCUMENT */,
PR_TRUE /* TYPE_SUBDOCUMENT */,
- PR_TRUE /* TYPE_REFRESH */
+ PR_TRUE /* TYPE_REFRESH */,
+#ifdef HAVE_GECO_1_9
+ PR_FALSE /* TYPE_XBEL */,
+ PR_TRUE /* TYPE_PING */,
+ PR_FALSE /* TYPE_XMLHTTPREQUEST */,
+ PR_TRUE /* TYPE_OBJECT_SUBREQUEST */,
+#endif /* HAVE_GECKO_1_9 */
};
if (kBlockType[aContentType < G_N_ELEMENTS (kBlockType) ? aContentType : 0])