diff --git a/caps/src/nsCodebasePrincipal.cpp b/caps/src/nsCodebasePrincipal.cpp index 7b62a2452f58..51c3b4177084 100644 --- a/caps/src/nsCodebasePrincipal.cpp +++ b/caps/src/nsCodebasePrincipal.cpp @@ -96,8 +96,8 @@ nsCodebasePrincipal::CanEnableCapability(const char *capability, PRBool isFile = PR_FALSE; PRBool isRes = PR_FALSE; - if (NS_FAILED(mURI->SchemeIs(nsIURI::FILE, &isFile)) || - NS_FAILED(mURI->SchemeIs(nsIURI::RESOURCE, &isRes)) || + if (NS_FAILED(mURI->SchemeIs("file", &isFile)) || + NS_FAILED(mURI->SchemeIs("resource", &isRes)) || (!isFile && !isRes)) { *result = nsIPrincipal::ENABLE_DENIED; diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index f8419df19a63..7799c5cbca19 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -526,8 +526,8 @@ nsScriptSecurityManager::CheckLoadURIFromScript(JSContext *cx, // UniversalFileRead capability trump the above check. PRBool isFile = PR_FALSE; PRBool isRes = PR_FALSE; - if (NS_FAILED(aURI->SchemeIs(nsIURI::FILE, &isFile)) || - NS_FAILED(aURI->SchemeIs(nsIURI::RESOURCE, &isRes))) + if (NS_FAILED(aURI->SchemeIs("file", &isFile)) || + NS_FAILED(aURI->SchemeIs("resource", &isRes))) return NS_ERROR_FAILURE; if (isFile || isRes) { diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index b5d3e7a4eac1..61fc261536a0 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -1090,7 +1090,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() static PRBool IsChromeURI(nsIURI* aURI) { PRBool isChrome=PR_FALSE; - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::CHROME, &isChrome)) && isChrome) + if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome) return PR_TRUE; return PR_FALSE; } diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 23ec8f197d0b..215a9b3171de 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -763,8 +763,8 @@ nsDocument::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup) PRBool isChrome = PR_FALSE; PRBool isRes = PR_FALSE; - (void)uri->SchemeIs(nsIURI::CHROME, &isChrome); - (void)uri->SchemeIs(nsIURI::RESOURCE, &isRes); + (void)uri->SchemeIs("chrome", &isChrome); + (void)uri->SchemeIs("resource", &isRes); if (isChrome || isRes) (void)aChannel->GetOriginalURI(&mDocumentURL); diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp index 4bba3f81c41a..f87b9f7b1b89 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -204,8 +204,8 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsIDOMEven PRBool isChrome = PR_FALSE; PRBool isRes = PR_FALSE; - url->SchemeIs(nsIURI::CHROME, &isChrome); - url->SchemeIs(nsIURI::RESOURCE, &isRes); + url->SchemeIs("chrome", &isChrome); + url->SchemeIs("resource", &isRes); if (!isChrome && !isRes) return NS_OK; diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index bc35c5a22730..b208ed7c7a35 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -82,8 +82,8 @@ static PRBool IsChromeOrResourceURI(nsIURI* aURI) { PRBool isChrome = PR_FALSE; PRBool isResource = PR_FALSE; - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::CHROME, &isChrome)) && - NS_SUCCEEDED(aURI->SchemeIs(nsIURI::RESOURCE, &isResource))) + if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && + NS_SUCCEEDED(aURI->SchemeIs("resource", &isResource))) return (isChrome || isResource); return PR_FALSE; } @@ -91,7 +91,7 @@ static PRBool IsChromeOrResourceURI(nsIURI* aURI) static PRBool IsResourceURI(nsIURI* aURI) { PRBool isResource = PR_FALSE; - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::RESOURCE, &isResource)) && isResource) + if (NS_SUCCEEDED(aURI->SchemeIs("resource", &isResource)) && isResource) return PR_TRUE; return PR_FALSE; } diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 0d6acc96e474..c79d4c532f94 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -174,7 +174,7 @@ static PRBool IsChromeURI(nsIURI* aURI) { // why is this check a member function of nsXULDocument? -gagan PRBool isChrome=PR_FALSE; - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::CHROME, &isChrome)) && isChrome) + if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome) return PR_TRUE; return PR_FALSE; } diff --git a/directory/xpcom/base/src/nsLDAPURL.cpp b/directory/xpcom/base/src/nsLDAPURL.cpp index ac195361b334..b45f2d9ca33b 100644 --- a/directory/xpcom/base/src/nsLDAPURL.cpp +++ b/directory/xpcom/base/src/nsLDAPURL.cpp @@ -244,11 +244,16 @@ NS_IMETHODIMP nsLDAPURL::Equals(nsIURI *other, PRBool *_retval) return NS_ERROR_NOT_IMPLEMENTED; } -// boolean schemeIs(in PRUint32 scheme); +// boolean schemeIs(in const char * scheme); // -NS_IMETHODIMP nsLDAPURL::SchemeIs(PRUint32 i_Scheme, PRBool *o_Equals) +NS_IMETHODIMP nsLDAPURL::SchemeIs(const char *i_Scheme, PRBool *o_Equals) { - *o_Equals = (i_Scheme == nsIURI::LDAP); + if (!i_Scheme) return NS_ERROR_INVALID_ARG; + id (*i_Scheme == 'l' || *i_Scheme == 'L') { + *o_Equals = PL_strcasecmp("ldap", i_Scheme) ? PR_FALSE : PR_TRUE; + } else { + *o_Equals = PR_FALSE; + } return NS_OK; } diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 3c550f4da527..8ad5a02d0128 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -2969,8 +2969,8 @@ NS_IMETHODIMP nsDocShell::InternalLoad(nsIURI* aURI, nsIURI* aReferrer, { PRBool isChrome = PR_FALSE; PRBool isResource = PR_FALSE; - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::CHROME, &isChrome)) && - NS_SUCCEEDED(aURI->SchemeIs(nsIURI::RESOURCE, &isResource)) && + if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && + NS_SUCCEEDED(aURI->SchemeIs("resource", &isResource)) && !isChrome && !isResource) { static const char top[] = "_top"; @@ -3182,7 +3182,7 @@ NS_IMETHODIMP nsDocShell::DoURILoad(nsIURI* aURI, nsIURI* aReferrerURI, if (aWindowTarget && *aWindowTarget) { PRBool isJSURL = PR_FALSE; // do it only for javascript urls! - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::JAVASCRIPT, &isJSURL)) && isJSURL) + if (NS_SUCCEEDED(aURI->SchemeIs("javascript", &isJSURL)) && isJSURL) { nsAutoString targetName; targetName.AssignWithConversion(aWindowTarget); @@ -3249,7 +3249,7 @@ NS_IMETHODIMP nsDocShell::DoURILoad(nsIURI* aURI, nsIURI* aReferrerURI, nsCOMPtr ioChannel(do_QueryInterface(channel)); if(ioChannel) // Might be a javascript: URL load, need to set owner { - aURI->SchemeIs(nsIURI::JAVASCRIPT, &isJSOrData); + aURI->SchemeIs("javascript", &isJSOrData); } else { // Also set owner for data: URLs @@ -4181,8 +4181,8 @@ NS_IMETHODIMP nsDocShell::ShouldAddToGlobalHistory(nsIURI* aURI, PRBool* aShould // to it. PRBool isHTTP = PR_FALSE; PRBool isHTTPS = PR_FALSE; - NS_ENSURE_SUCCESS(aURI->SchemeIs(nsIURI::HTTP, &isHTTP), NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(aURI->SchemeIs(nsIURI::HTTPS, &isHTTPS), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(aURI->SchemeIs("http", &isHTTP), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(aURI->SchemeIs("https", &isHTTPS), NS_ERROR_FAILURE); if (isHTTP || isHTTPS) { @@ -4195,10 +4195,10 @@ NS_IMETHODIMP nsDocShell::ShouldAddToGlobalHistory(nsIURI* aURI, PRBool* aShould PRBool isNews = PR_FALSE; PRBool isMailbox = PR_FALSE; - NS_ENSURE_SUCCESS(aURI->SchemeIs(nsIURI::ABOUT, &isAbout), NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(aURI->SchemeIs(nsIURI::IMAP, &isImap), NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(aURI->SchemeIs(nsIURI::NEWS, &isNews), NS_ERROR_FAILURE); - NS_ENSURE_SUCCESS(aURI->SchemeIs(nsIURI::MAILBOX, &isMailbox), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(aURI->SchemeIs("about", &isAbout), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(aURI->SchemeIs("imap", &isImap), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(aURI->SchemeIs("news", &isNews), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(aURI->SchemeIs("mailbox", &isMailbox), NS_ERROR_FAILURE); if (isAbout || isImap || isNews || isMailbox) return NS_OK; diff --git a/editor/base/nsEditorShell.cpp b/editor/base/nsEditorShell.cpp index ee07603fa363..fa453e3bca2d 100644 --- a/editor/base/nsEditorShell.cpp +++ b/editor/base/nsEditorShell.cpp @@ -565,7 +565,7 @@ nsEditorShell::PrepareDocumentForEditing(nsIDOMWindow* aDOMWindow, nsIURI *aUrl) // in the disk document, so that later saves save back to the same file. nsCOMPtr pageFileURL(do_QueryInterface(aUrl)); PRBool isFile=PR_FALSE; - rv = aUrl->SchemeIs(nsIURI::FILE, &isFile); + rv = aUrl->SchemeIs("file", &isFile); if (NS_SUCCEEDED(rv) && isFile && pageFileURL) { nsCOMPtr pageFile; diff --git a/editor/composer/src/nsEditorShell.cpp b/editor/composer/src/nsEditorShell.cpp index ee07603fa363..fa453e3bca2d 100644 --- a/editor/composer/src/nsEditorShell.cpp +++ b/editor/composer/src/nsEditorShell.cpp @@ -565,7 +565,7 @@ nsEditorShell::PrepareDocumentForEditing(nsIDOMWindow* aDOMWindow, nsIURI *aUrl) // in the disk document, so that later saves save back to the same file. nsCOMPtr pageFileURL(do_QueryInterface(aUrl)); PRBool isFile=PR_FALSE; - rv = aUrl->SchemeIs(nsIURI::FILE, &isFile); + rv = aUrl->SchemeIs("file", &isFile); if (NS_SUCCEEDED(rv) && isFile && pageFileURL) { nsCOMPtr pageFile; diff --git a/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index 4dc9379553d4..913c16c647b8 100644 --- a/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -860,7 +860,7 @@ nsXMLHttpRequest::OpenRequest(const char *method, // The following check takes the place of nsScriptSecurityManager::CheckLoadURI // since loads of http URLs are always allowed. PRBool isHTTP = PR_FALSE; - uri->SchemeIs(nsIURI::HTTP, &isHTTP); + uri->SchemeIs("http", &isHTTP); if (!isHTTP) return NS_ERROR_INVALID_ARG; diff --git a/htmlparser/src/nsExpatTokenizer.cpp b/htmlparser/src/nsExpatTokenizer.cpp index fb216aed9197..21a3c6a2aee4 100644 --- a/htmlparser/src/nsExpatTokenizer.cpp +++ b/htmlparser/src/nsExpatTokenizer.cpp @@ -727,7 +727,7 @@ IsLoadableDTD(nsCOMPtr* aDTD) } // Return true if the url is a chrome url - res = (*aDTD)->SchemeIs(nsIURI::CHROME, &isLoadable); + res = (*aDTD)->SchemeIs("chrome", &isLoadable); // If the url is not a chrome url, check to see if a DTD file of the same name // exists in the special DTD directory diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 39fa0fee40cc..d798c15c9e44 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -458,8 +458,8 @@ nsPresContext::SetShell(nsIPresShell* aShell) if (mBaseURL) { PRBool isChrome = PR_FALSE; PRBool isRes = PR_FALSE; - mBaseURL->SchemeIs(nsIURI::CHROME, &isChrome); - mBaseURL->SchemeIs(nsIURI::RESOURCE, &isRes); + mBaseURL->SchemeIs("chrome", &isChrome); + mBaseURL->SchemeIs("resource", &isRes); if (!isChrome && !isRes) mImageAnimationMode = mImageAnimationModePref; diff --git a/layout/base/src/nsPresContext.cpp b/layout/base/src/nsPresContext.cpp index 39fa0fee40cc..d798c15c9e44 100644 --- a/layout/base/src/nsPresContext.cpp +++ b/layout/base/src/nsPresContext.cpp @@ -458,8 +458,8 @@ nsPresContext::SetShell(nsIPresShell* aShell) if (mBaseURL) { PRBool isChrome = PR_FALSE; PRBool isRes = PR_FALSE; - mBaseURL->SchemeIs(nsIURI::CHROME, &isChrome); - mBaseURL->SchemeIs(nsIURI::RESOURCE, &isRes); + mBaseURL->SchemeIs("chrome", &isChrome); + mBaseURL->SchemeIs("resource", &isRes); if (!isChrome && !isRes) mImageAnimationMode = mImageAnimationModePref; diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp index cf9697803cf8..3c597b096200 100644 --- a/layout/forms/nsIsIndexFrame.cpp +++ b/layout/forms/nsIsIndexFrame.cpp @@ -444,7 +444,7 @@ nsIsIndexFrame::OnSubmit(nsIPresContext* aPresContext) nsXPIDLCString scheme; PRBool isJSURL = PR_FALSE; if (NS_SUCCEEDED(result = NS_NewURI(getter_AddRefs(actionURL), href, docURL))) { - result = actionURL->SchemeIs(nsIURI::JAVASCRIPT, &isJSURL); + result = actionURL->SchemeIs("javascript", &isJSURL); } // Append the URI encoded variable/value pairs for GET's if (!isJSURL) { // Not for JS URIs, see bug 26917 diff --git a/layout/html/forms/src/nsFormFrame.cpp b/layout/html/forms/src/nsFormFrame.cpp index 869b8cc51dbc..bb941f86b620 100644 --- a/layout/html/forms/src/nsFormFrame.cpp +++ b/layout/html/forms/src/nsFormFrame.cpp @@ -806,7 +806,7 @@ nsFormFrame::OnSubmit(nsIPresContext* aPresContext, nsIFrame* aFrame) nsXPIDLCString scheme; PRBool isMailto = PR_FALSE; - if (actionURL && NS_FAILED(result = actionURL->SchemeIs(nsIURI::MAILTO, + if (actionURL && NS_FAILED(result = actionURL->SchemeIs("mailto", &isMailto))) return result; if (isMailto) { diff --git a/layout/html/forms/src/nsIsIndexFrame.cpp b/layout/html/forms/src/nsIsIndexFrame.cpp index cf9697803cf8..3c597b096200 100644 --- a/layout/html/forms/src/nsIsIndexFrame.cpp +++ b/layout/html/forms/src/nsIsIndexFrame.cpp @@ -444,7 +444,7 @@ nsIsIndexFrame::OnSubmit(nsIPresContext* aPresContext) nsXPIDLCString scheme; PRBool isJSURL = PR_FALSE; if (NS_SUCCEEDED(result = NS_NewURI(getter_AddRefs(actionURL), href, docURL))) { - result = actionURL->SchemeIs(nsIURI::JAVASCRIPT, &isJSURL); + result = actionURL->SchemeIs("javascript", &isJSURL); } // Append the URI encoded variable/value pairs for GET's if (!isJSURL) { // Not for JS URIs, see bug 26917 diff --git a/parser/htmlparser/src/nsExpatTokenizer.cpp b/parser/htmlparser/src/nsExpatTokenizer.cpp index fb216aed9197..21a3c6a2aee4 100644 --- a/parser/htmlparser/src/nsExpatTokenizer.cpp +++ b/parser/htmlparser/src/nsExpatTokenizer.cpp @@ -727,7 +727,7 @@ IsLoadableDTD(nsCOMPtr* aDTD) } // Return true if the url is a chrome url - res = (*aDTD)->SchemeIs(nsIURI::CHROME, &isLoadable); + res = (*aDTD)->SchemeIs("chrome", &isLoadable); // If the url is not a chrome url, check to see if a DTD file of the same name // exists in the special DTD directory diff --git a/rdf/chrome/src/nsChromeRegistry.cpp b/rdf/chrome/src/nsChromeRegistry.cpp index b5d3e7a4eac1..61fc261536a0 100644 --- a/rdf/chrome/src/nsChromeRegistry.cpp +++ b/rdf/chrome/src/nsChromeRegistry.cpp @@ -1090,7 +1090,7 @@ NS_IMETHODIMP nsChromeRegistry::RefreshSkins() static PRBool IsChromeURI(nsIURI* aURI) { PRBool isChrome=PR_FALSE; - if (NS_SUCCEEDED(aURI->SchemeIs(nsIURI::CHROME, &isChrome)) && isChrome) + if (NS_SUCCEEDED(aURI->SchemeIs("chrome", &isChrome)) && isChrome) return PR_TRUE; return PR_FALSE; }