fix bug 166085 [Assertion constructing about: URIs

[@nsAboutProtocolHandler:122]] This is a regression fix from the fix
for bug 163225. The assertions never made sense and now they are
exposed. r=bzbarsky, sr=darin


git-svn-id: svn://10.0.0.236/trunk@128681 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
andreas.otte%debitel.net 2002-09-02 22:04:03 +00:00
parent 9ea8d4c86b
commit fa69b03848
9 changed files with 4 additions and 24 deletions

View File

@ -78,9 +78,6 @@ nsWyciwygProtocolHandler::NewURI(const nsACString &aSpec,
{
nsresult rv;
// no concept of a relative wyciwyg url
NS_ASSERTION(!aBaseURI, "base url passed into wyciwyg protocol handler");
nsIURI* url;
rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
NS_GET_IID(nsIURI),

View File

@ -94,9 +94,6 @@ nsLDAPProtocolHandler::NewURI(const nsACString &aSpec,
nsCOMPtr<nsILDAPURL> url;
nsresult rv;
// no concept of a relative ldap url
NS_ASSERTION(!aBaseURI, "base url passed into LDAP protocol handler");
url = do_CreateInstance(kLDAPURLCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);

View File

@ -76,8 +76,6 @@ NS_IMETHODIMP inBitmapProtocolHandler::NewURI(const nsACString &aSpec,
nsIURI *aBaseURI,
nsIURI **result)
{
// no concept of a relative bitmap url
NS_ASSERTION(!aBaseURI, "base url passed into bitmap protocol handler");
nsCOMPtr<nsIURI> uri;
NS_NEWXPCOM(uri, inBitmapURI);

View File

@ -76,8 +76,6 @@ NS_IMETHODIMP nsIconProtocolHandler::NewURI(const nsACString &aSpec,
nsIURI *aBaseURI,
nsIURI **result)
{
// no concept of a relative icon url
NS_ASSERTION(!aBaseURI, "base url passed into icon protocol handler");
nsCOMPtr<nsIURI> uri;
NS_NEWXPCOM(uri, nsMozIconURI);

View File

@ -85,8 +85,10 @@ interface nsIProtocolHandler : nsISupports
* null, then UTF-8 encoding is assumed (i.e.,
* no charset transformation from aSpec).
* @param aBaseURI - if null, aSpec must specify an absolute URI.
* otherwise, aSpec will be resolved relative
* to aBaseURI.
* otherwise, aSpec may be resolved relative
* to aBaseURI, depending on the protocol.
* If the protocol has no concept of relative
* URI aBaseURI will simply be ignored.
*/
nsIURI newURI(in AUTF8String aSpec,
in string aOriginCharset,

View File

@ -118,9 +118,6 @@ nsAboutProtocolHandler::NewURI(const nsACString &aSpec,
{
nsresult rv;
// no concept of a relative about url
NS_ASSERTION(!aBaseURI, "base url passed into about protocol handler");
nsIURI* url;
rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
NS_GET_IID(nsIURI),

View File

@ -101,9 +101,6 @@ nsDataHandler::NewURI(const nsACString &aSpec,
nsIURI **result) {
nsresult rv;
// no concept of a relative data url
NS_ASSERTION(!aBaseURI, "base url passed into data protocol handler");
nsIURI* url;
rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
NS_GET_IID(nsIURI),

View File

@ -102,9 +102,6 @@ nsDateTimeHandler::NewURI(const nsACString &aSpec,
nsIURI **result) {
nsresult rv;
// no concept of a relative datetime url
NS_ASSERTION(!aBaseURI, "base url passed into datetime protocol handler");
nsIURI* url;
rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
NS_GET_IID(nsIURI),

View File

@ -87,9 +87,6 @@ nsFingerHandler::NewURI(const nsACString &aSpec,
nsIURI **result) {
nsresult rv;
// no concept of a relative finger url
NS_ASSERTION(!aBaseURI, "base url passed into finger protocol handler");
nsIURI* url;
rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
NS_GET_IID(nsIURI),