merge mozilla-inbound to mozilla-central a=merge

This commit is contained in:
Carsten "Tomcat" Book
2015-06-29 14:17:02 +02:00
611 changed files with 21632 additions and 4534 deletions

View File

@@ -14028,6 +14028,11 @@ nsDocShell::ShouldPrepareForIntercept(nsIURI* aURI, bool aIsNavigate,
return NS_OK;
}
// No in private browsing
if (mInPrivateBrowsing) {
return NS_OK;
}
if (mSandboxFlags) {
// If we're sandboxed, don't intercept.
return NS_OK;