Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Landing xpcom20/21 branch.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@32644 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dp%netscape.com
1999-05-26 01:38:36 +00:00
parent 300d6f0885
commit befa259a88
460 changed files with 3692 additions and 1767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/xpcom/base/nsAllocator.cpp
View File

@@ -24,9 +24,6 @@
#include "nsIServiceManager.h"
#include <string.h> /* for memcpy */
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIAllocatorIID, NS_IALLOCATOR_IID);
nsAllocatorImpl::nsAllocatorImpl(nsISupports* outer)
{
NS_INIT_AGGREGATED(outer);
@@ -44,8 +41,8 @@ nsAllocatorImpl::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
if (aIID.Equals(kIAllocatorIID) ||
aIID.Equals(kISupportsIID)) {
if (aIID.Equals(nsIAllocator::GetIID()) ||
aIID.Equals(nsISupports::GetIID())) {
*aInstancePtr = (void*) this;
AddRef();
return NS_OK;
@@ -56,13 +53,13 @@ nsAllocatorImpl::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr
NS_METHOD
nsAllocatorImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
{
if (outer && !aIID.Equals(kISupportsIID))
if (outer && !aIID.Equals(nsISupports::GetIID()))
return NS_NOINTERFACE; // XXX right error?
nsAllocatorImpl* mm = new nsAllocatorImpl(outer);
if (mm == NULL)
return NS_ERROR_OUT_OF_MEMORY;
mm->AddRef();
if (aIID.Equals(kISupportsIID))
if (aIID.Equals(nsISupports::GetIID()))
*aInstancePtr = mm->GetInner();
else
*aInstancePtr = mm;
@@ -102,7 +99,7 @@ nsAllocatorImpl::HeapMinimize(void)
}
////////////////////////////////////////////////////////////////////////////////
#if 0
nsAllocatorFactory::nsAllocatorFactory(void)
{
NS_INIT_REFCNT();
@@ -128,6 +125,7 @@ nsAllocatorFactory::LockFactory(PRBool aLock)
{
return NS_OK; // XXX what?
}
#endif
////////////////////////////////////////////////////////////////////////////////
@@ -175,10 +173,7 @@ nsIAllocator* nsAllocator::mAllocator = NULL;
PRBool nsAllocator::FetchAllocator()
{
NS_DEFINE_IID(kAllocatorCID, NS_ALLOCATOR_CID);
NS_DEFINE_IID(kIAllocatorIID, NS_IALLOCATOR_IID);
nsServiceManager::GetService(kAllocatorCID, kIAllocatorIID,
(nsISupports **)&mAllocator);
nsAllocatorImpl::Create(NULL, nsIAllocator::GetIID(), (void**)&mAllocator);
NS_ASSERTION(mAllocator, "failed to get Allocator!");
return (PRBool) mAllocator;
}