Fix for bug 21368. navigator.plugins methods were returning an error code if the plugin wasn't found instead of returning null. a=jar R=pollmann.

This commit is contained in:
vidur%netscape.com 1999-12-15 00:25:00 +00:00
Родитель 12e50bccc1
Коммит 7bec6370c1
1 изменённых файлов: 10 добавлений и 6 удалений

Просмотреть файл

@ -118,13 +118,14 @@ NS_IMETHODIMP PluginArrayImpl::Item(PRUint32 aIndex, nsIDOMPlugin** aReturn)
return rv;
}
*aReturn = nsnull;
if (aIndex < mPluginCount) {
*aReturn = mPluginArray[aIndex];
NS_IF_ADDREF(*aReturn);
return NS_OK;
}
return NS_ERROR_FAILURE;
return NS_OK;
}
NS_IMETHODIMP PluginArrayImpl::NamedItem(const nsString& aName, nsIDOMPlugin** aReturn)
@ -146,12 +147,12 @@ NS_IMETHODIMP PluginArrayImpl::NamedItem(const nsString& aName, nsIDOMPlugin** a
if (pluginName == aName) {
*aReturn = plugin;
NS_IF_ADDREF(plugin);
return NS_OK;
break;
}
}
}
return NS_ERROR_FAILURE;
return NS_OK;
}
NS_IMETHODIMP PluginArrayImpl::Refresh(PRBool aReloadDocuments)
@ -294,6 +295,8 @@ NS_IMETHODIMP PluginElementImpl::NamedItem(const nsString& aName, nsIDOMMimeType
if (rv != NS_OK)
return rv;
}
*aReturn = nsnull;
for (PRUint32 i = 0; i < mMimeTypeCount; i++) {
nsString type;
nsIDOMMimeType* mimeType = mMimeTypeArray[i];
@ -301,11 +304,12 @@ NS_IMETHODIMP PluginElementImpl::NamedItem(const nsString& aName, nsIDOMMimeType
if (type == aName) {
*aReturn = mimeType;
NS_ADDREF(mimeType);
return NS_OK;
break;
}
}
}
return NS_ERROR_FAILURE;
return NS_OK;
}
nsresult PluginElementImpl::GetMimeTypes()