mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

don't ASSERT that it doesn't support weak references for NULL. r=pinkerton

This commit is contained in:
scc%netscape.com 1999-11-23 03:10:02 +00:00
Родитель af437476c2
Коммит e2e36b3c4a
2 изменённых файлов: 68 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
xpcom/base/nsWeakReference.cpp
Просмотреть файл

@ -43,18 +43,25 @@ nsQueryReferent::operator()( const nsIID& aIID, void** answer ) const
}
NS_COM nsIWeakReference*
NS_GetWeakReference( nsISupports* aInstance, nsresult* aResult )
NS_GetWeakReference( nsISupports* aInstancePtr, nsresult* aErrorPtr )
{
nsresult status;
if ( !aResult )
aResult = &status;
nsIWeakReference* result = 0;
nsCOMPtr<nsISupportsWeakReference> factoryP = do_QueryInterface(aInstance, aResult);
NS_ASSERTION(factoryP, "Did you know you were calling |NS_GetWeakReference()| on something that doesn't support weak references?");
if ( aInstancePtr )
{
nsCOMPtr<nsISupportsWeakReference> factoryPtr = do_QueryInterface(aInstancePtr, &status);
NS_ASSERTION(factoryPtr, "Did you know you were calling |NS_GetWeakReference()| on something that doesn't support weak references?");
if ( factoryPtr )
status = factoryPtr->GetWeakReference(&result);
// else, |status| has already been set by |do_QueryInterface|
}
else
status = NS_ERROR_NULL_POINTER;
nsIWeakReference* weakP = 0;
status = factoryP ? factoryP->GetWeakReference(&weakP) : NS_ERROR_NO_INTERFACE;
return weakP;
if ( aErrorPtr )
*aErrorPtr = status;
return result;
}
NS_IMETHODIMP

23
xpcom/glue/nsWeakReference.cpp
Просмотреть файл

@ -43,18 +43,25 @@ nsQueryReferent::operator()( const nsIID& aIID, void** answer ) const
}
NS_COM nsIWeakReference*
NS_GetWeakReference( nsISupports* aInstance, nsresult* aResult )
NS_GetWeakReference( nsISupports* aInstancePtr, nsresult* aErrorPtr )
{
nsresult status;
if ( !aResult )
aResult = &status;
nsIWeakReference* result = 0;
nsCOMPtr<nsISupportsWeakReference> factoryP = do_QueryInterface(aInstance, aResult);
NS_ASSERTION(factoryP, "Did you know you were calling |NS_GetWeakReference()| on something that doesn't support weak references?");
if ( aInstancePtr )
{
nsCOMPtr<nsISupportsWeakReference> factoryPtr = do_QueryInterface(aInstancePtr, &status);
NS_ASSERTION(factoryPtr, "Did you know you were calling |NS_GetWeakReference()| on something that doesn't support weak references?");
if ( factoryPtr )
status = factoryPtr->GetWeakReference(&result);
// else, |status| has already been set by |do_QueryInterface|
}
else
status = NS_ERROR_NULL_POINTER;
nsIWeakReference* weakP = 0;
status = factoryP ? factoryP->GetWeakReference(&weakP) : NS_ERROR_NO_INTERFACE;
return weakP;
if ( aErrorPtr )
*aErrorPtr = status;
return result;
}
NS_IMETHODIMP