corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 956930 - Launching an app preloading appcache throws an offline error, r=jduell+sicking

Browse Source
This commit is contained in:
Honza Bambas
2014-02-04 01:52:57 +01:00
parent 436b0b1512
commit 88929cec3e
8 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docshell/base/nsDocShell.cpp
View File

@@ -6781,9 +6781,15 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
// Permission will be checked in the parent process.
appCacheChannel->SetChooseApplicationCache(true);
} else {
appCacheChannel->SetChooseApplicationCache(
NS_ShouldCheckAppCache(newURI,
mInPrivateBrowsing));
nsCOMPtr<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
if (secMan) {
nsCOMPtr<nsIPrincipal> principal;
secMan->GetDocShellCodebasePrincipal(newURI, this, getter_AddRefs(principal));
appCacheChannel->SetChooseApplicationCache(NS_ShouldCheckAppCache(principal,
mInPrivateBrowsing));
}
}
}
@@ -9713,8 +9719,15 @@ nsDocShell::DoURILoad(nsIURI * aURI,
// Permission will be checked in the parent process
appCacheChannel->SetChooseApplicationCache(true);
} else {
appCacheChannel->SetChooseApplicationCache(
NS_ShouldCheckAppCache(aURI, mInPrivateBrowsing));
nsCOMPtr<nsIScriptSecurityManager> secMan =
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
if (secMan) {
nsCOMPtr<nsIPrincipal> principal;
secMan->GetDocShellCodebasePrincipal(aURI, this, getter_AddRefs(principal));
appCacheChannel->SetChooseApplicationCache(
NS_ShouldCheckAppCache(principal, mInPrivateBrowsing));
}
}
}