From 4a050fe62443f64df7b7cbbb2a214e3cfcbb66cb Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Sat, 27 May 2000 05:22:39 +0000 Subject: [PATCH] #if-0 out mstoltz's changes to fix tinderbox. git-svn-id: svn://10.0.0.236/trunk@70994 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSLoader.cpp | 4 +++- mozilla/layout/html/style/src/nsCSSLoader.cpp | 4 +++- mozilla/layout/style/nsCSSLoader.cpp | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index 927396fcdf2..04ebf5a1018 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -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; diff --git a/mozilla/layout/html/style/src/nsCSSLoader.cpp b/mozilla/layout/html/style/src/nsCSSLoader.cpp index 927396fcdf2..04ebf5a1018 100644 --- a/mozilla/layout/html/style/src/nsCSSLoader.cpp +++ b/mozilla/layout/html/style/src/nsCSSLoader.cpp @@ -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; diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index 927396fcdf2..04ebf5a1018 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -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;