Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 07:34:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 877961 - PrivateBrowsingChannel: Allow SetPrivate on a channel with a load group but no load context; r=ehsan, r=jduell

Browse Source
This commit is contained in:
Mook 2013-06-06 19:46:06 -07:00
parent 7ea082d4cc
commit be1d4ceb3b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netwerk/base/src/PrivateBrowsingChannel.h
View File

@ -29,17 +29,14 @@ public:
NS_IMETHOD SetPrivate(bool aPrivate)
{
// Make sure that we don't have a load group or a load context
// Make sure that we don't have a load context
// This is a fatal error in debug builds, and a runtime error in release
// builds.
nsILoadGroup* loadGroup = static_cast<Channel*>(this)->mLoadGroup;
nsCOMPtr<nsILoadContext> loadContext;
if (!loadGroup) {
NS_QueryNotificationCallbacks(static_cast<Channel*>(this), loadContext);
}
MOZ_ASSERT(!loadGroup && !loadContext);
if (loadGroup || loadContext) {
return NS_ERROR_FAILURE;
NS_QueryNotificationCallbacks(static_cast<Channel*>(this), loadContext);
MOZ_ASSERT(!loadContext);
if (loadContext) {
return NS_ERROR_FAILURE;
}
mPrivateBrowsingOverriden = true;

1
netwerk/test/unit/test_private_necko_channel.js
View File

@ -24,6 +24,7 @@ function run_test() {
httpserver.start(4444);
var channel = setupChannel(testpath);
channel.loadGroup = Cc["@mozilla.org/network/load-group;1"].createInstance();
channel.QueryInterface(Ci.nsIPrivateBrowsingChannel);
channel.setPrivate(true);