Bug 1210941 P7 Use LOAD_BYPASS_SERVICE_WORKER in ServiceWorkerScriptCache. r=ehsan

This commit is contained in:
Ben Kelly 2015-10-06 06:37:07 -07:00
parent a6f4c63338
commit 50934f88eb

View File

@ -117,7 +117,9 @@ public:
uri, aPrincipal,
nsILoadInfo::SEC_NORMAL,
nsIContentPolicy::TYPE_INTERNAL_SCRIPT,
loadGroup);
loadGroup,
nullptr, // aCallbacks
nsIChannel::LOAD_BYPASS_SERVICE_WORKER);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
@ -140,12 +142,6 @@ public:
httpChannel->SetRedirectionLimit(0);
}
// Don't let serviceworker intercept.
nsCOMPtr<nsIHttpChannelInternal> internalChannel = do_QueryInterface(mChannel);
if (internalChannel) {
internalChannel->ForceNoIntercept();
}
nsCOMPtr<nsIStreamLoader> loader;
rv = NS_NewStreamLoader(getter_AddRefs(loader), this, this);
if (NS_WARN_IF(NS_FAILED(rv))) {