diff options
| author | Josselin Mouette <jmouette@src.gnome.org> | 2007-09-27 20:42:57 +0800 |
|---|---|---|
| committer | Josselin Mouette <jmouette@src.gnome.org> | 2007-09-27 20:42:57 +0800 |
| commit | 365a2dc852c4b86aa9d8cce729634821b0c0e231 (patch) | |
| tree | 48b184aee7bc632dd6fb21958c2af19ca3c96fbe /embed | |
| parent | 8fda40e760bd44bd5815a1c2ff85f6c05c1f8a60 (diff) | |
| download | gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.tar gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.tar.gz gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.tar.bz2 gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.tar.lz gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.tar.xz gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.tar.zst gsoc2013-epiphany-365a2dc852c4b86aa9d8cce729634821b0c0e231.zip | |
EphyContentPolicy::ShouldLoad: use the same content policy for
http and https, allowing adblock to work on https.
Patch reviewed by Christian Persch, fixes bug#471583.
svn path=/trunk/; revision=7498
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/EphyContentPolicy.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp index fc367c2b1..f72f2f172 100644 --- a/embed/mozilla/EphyContentPolicy.cpp +++ b/embed/mozilla/EphyContentPolicy.cpp @@ -128,10 +128,6 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType, aContentLocation->SchemeIs ("resource", &isResource); if (isChrome || isResource) return NS_OK; - PRBool isHttps = PR_FALSE; - aContentLocation->SchemeIs ("https", &isHttps); - if (isHttps) return NS_OK; - /* is this url allowed ? */ nsCString contentSpec; aContentLocation->GetSpec (contentSpec); @@ -170,6 +166,10 @@ EphyContentPolicy::ShouldLoad(PRUint32 aContentType, } } + PRBool isHttps = PR_FALSE; + aContentLocation->SchemeIs ("https", &isHttps); + if (isHttps) return NS_OK; + PRBool isHttp = PR_FALSE; aContentLocation->SchemeIs ("http", &isHttp); if (isHttp) return NS_OK; |