Bug 1268147 - Remove nsScriptLoader::ShouldLoadScript (r=sicking)

This commit is contained in:
Christoph Kerschbaumer 2016-05-06 15:31:48 +02:00
Родитель f780378910
Коммит efc3c94b66
2 изменённых файлов: 0 добавлений и 33 удалений

Просмотреть файл

@ -235,29 +235,6 @@ nsScriptLoader::CheckContentPolicy(nsIDocument* aDocument,
return NS_OK;
}
nsresult
nsScriptLoader::ShouldLoadScript(nsIDocument* aDocument,
nsISupports* aContext,
nsIURI* aURI,
const nsAString &aType,
bool aIsPreLoad)
{
// Check that the containing page is allowed to load this URI.
nsresult rv = nsContentUtils::GetSecurityManager()->
CheckLoadURIWithPrincipal(aDocument->NodePrincipal(), aURI,
nsIScriptSecurityManager::ALLOW_CHROME);
NS_ENSURE_SUCCESS(rv, rv);
// After the security manager, the content-policy stuff gets a veto
rv = CheckContentPolicy(aDocument, aContext, aURI, aType, aIsPreLoad);
if (NS_FAILED(rv)) {
return rv;
}
return NS_OK;
}
nsresult
nsScriptLoader::StartLoad(nsScriptLoadRequest *aRequest, const nsAString &aType,
bool aScriptFromHead)

Просмотреть файл

@ -362,16 +362,6 @@ public:
*/
void ProcessPendingRequests();
/**
* Check whether it's OK to load a script from aURI in
* aDocument.
*/
static nsresult ShouldLoadScript(nsIDocument* aDocument,
nsISupports* aContext,
nsIURI* aURI,
const nsAString &aType,
bool aIsPreLoad);
/**
* Starts deferring deferred scripts and puts them in the mDeferredRequests
* queue instead.