зеркало из https://github.com/mozilla/gecko-dev.git
#if-0 out mstoltz's changes to fix tinderbox.
This commit is contained in:
Родитель
0b0191d919
Коммит
9d7267c466
|
@ -1282,7 +1282,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
|
|||
if (! mDocument) {
|
||||
return NS_ERROR_NOT_INITIALIZED;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
//-- Make sure this page is allowed to load this URL
|
||||
nsresult rv;
|
||||
NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
|
||||
|
@ -1293,6 +1294,7 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
|
|||
rv = secMan->CheckLoadURI(docURI, aURL, PR_FALSE);
|
||||
NS_IF_RELEASE(docURI);
|
||||
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
|
||||
#endif
|
||||
|
||||
// XXX need to add code to cancel any pending sheets for element
|
||||
nsresult result = NS_ERROR_NULL_POINTER;
|
||||
|
|
|
@ -1282,7 +1282,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
|
|||
if (! mDocument) {
|
||||
return NS_ERROR_NOT_INITIALIZED;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
//-- Make sure this page is allowed to load this URL
|
||||
nsresult rv;
|
||||
NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
|
||||
|
@ -1293,6 +1294,7 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
|
|||
rv = secMan->CheckLoadURI(docURI, aURL, PR_FALSE);
|
||||
NS_IF_RELEASE(docURI);
|
||||
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
|
||||
#endif
|
||||
|
||||
// XXX need to add code to cancel any pending sheets for element
|
||||
nsresult result = NS_ERROR_NULL_POINTER;
|
||||
|
|
|
@ -1282,7 +1282,8 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
|
|||
if (! mDocument) {
|
||||
return NS_ERROR_NOT_INITIALIZED;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
//-- Make sure this page is allowed to load this URL
|
||||
nsresult rv;
|
||||
NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
|
||||
|
@ -1293,6 +1294,7 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
|
|||
rv = secMan->CheckLoadURI(docURI, aURL, PR_FALSE);
|
||||
NS_IF_RELEASE(docURI);
|
||||
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
|
||||
#endif
|
||||
|
||||
// XXX need to add code to cancel any pending sheets for element
|
||||
nsresult result = NS_ERROR_NULL_POINTER;
|
||||
|
|
Загрузка…
Ссылка в новой задаче