Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 473938 Stylesheets don't load without a safe browsing service r+sr=sicking

Browse Source
This commit is contained in:
Dave Camp 2009-01-16 21:54:39 +00:00
parent cca2d5f9d3
commit b6f597421e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsObjectLoadingContent.cpp
View File

@ -1754,10 +1754,6 @@ nsObjectLoadingContent::CheckClassifier(nsIChannel *aChannel)
NS_ENSURE_SUCCESS(rv, rv);
rv = classifier->Start(aChannel, PR_FALSE);
if (rv == NS_ERROR_FACTORY_NOT_REGISTERED) {
// no URI classifier, ignore this
return NS_OK;
}
NS_ENSURE_SUCCESS(rv, rv);
mClassifier = classifier;

12
docshell/base/nsDocShell.cpp
View File

@ -7798,11 +7798,6 @@ nsDocShell::CheckClassifier(nsIChannel *aChannel)
if (!classifier) return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = classifier->Start(aChannel, PR_FALSE);
if (rv == NS_ERROR_FACTORY_NOT_REGISTERED ||
rv == NS_ERROR_NOT_AVAILABLE) {
// no URI classifier => ignored cases
return NS_OK;
}
NS_ENSURE_SUCCESS(rv, rv);
mClassifier = classifier;
@ -9749,7 +9744,12 @@ nsClassifierCallback::Run()
nsCOMPtr<nsIURIClassifier> uriClassifier =
do_GetService(NS_URICLASSIFIERSERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
if (rv == NS_ERROR_FACTORY_NOT_REGISTERED ||
rv == NS_ERROR_NOT_AVAILABLE) {
// no URI classifier, ignore this failure.
return NS_OK;
}
NS_ENSURE_SUCCESS(rv, rv);
PRBool expectCallback;
rv = uriClassifier->Classify(uri, this, &expectCallback);