зеркало из https://github.com/mozilla/gecko-dev.git
Enable aggregation on the in-memory datasource.
This commit is contained in:
waterson%netscape.com
Родитель
97814c2d09
Коммит
183ea40ed1
|
|
@ -185,10 +185,16 @@ protected:
|
|||
nsIRDFResource* property,
|
||||
nsIRDFNode* target);
|
||||
|
||||
InMemoryDataSource(nsISupports* aOuter);
|
||||
virtual ~InMemoryDataSource();
|
||||
nsresult Init();
|
||||
|
||||
friend NS_IMETHODIMP
|
||||
NS_NewRDFInMemoryDataSource(nsISupports* aOuter, const nsIID& aIID, void** aResult);
|
||||
|
||||
nsISupports* mOuter;
|
||||
|
||||
public:
|
||||
InMemoryDataSource(void);
|
||||
virtual ~InMemoryDataSource(void);
|
||||
|
||||
// nsISupports
|
||||
NS_DECL_ISUPPORTS
|
||||
|
|
@ -322,7 +328,7 @@ public:
|
|||
nsIRDFNode* aTarget,
|
||||
PRBool aTruthValue);
|
||||
|
||||
virtual ~InMemoryAssertionEnumeratorImpl(void);
|
||||
virtual ~InMemoryAssertionEnumeratorImpl();
|
||||
|
||||
// nsISupports interface
|
||||
NS_DECL_ISUPPORTS
|
||||
|
|
@ -364,7 +370,7 @@ InMemoryAssertionEnumeratorImpl::InMemoryAssertionEnumeratorImpl(
|
|||
}
|
||||
}
|
||||
|
||||
InMemoryAssertionEnumeratorImpl::~InMemoryAssertionEnumeratorImpl(void)
|
||||
InMemoryAssertionEnumeratorImpl::~InMemoryAssertionEnumeratorImpl()
|
||||
{
|
||||
NS_IF_RELEASE(mDataSource);
|
||||
NS_IF_RELEASE(mSource);
|
||||
|
|
@ -489,7 +495,7 @@ InMemoryArcsEnumeratorImpl::InMemoryArcsEnumeratorImpl(InMemoryDataSource* aData
|
|||
}
|
||||
}
|
||||
|
||||
InMemoryArcsEnumeratorImpl::~InMemoryArcsEnumeratorImpl(void)
|
||||
InMemoryArcsEnumeratorImpl::~InMemoryArcsEnumeratorImpl()
|
||||
{
|
||||
NS_RELEASE(mDataSource);
|
||||
NS_IF_RELEASE(mSource);
|
||||
|
|
@ -571,40 +577,46 @@ InMemoryArcsEnumeratorImpl::GetNext(nsISupports** aResult)
|
|||
////////////////////////////////////////////////////////////////////////
|
||||
// InMemoryDataSource
|
||||
|
||||
NS_IMPL_ADDREF(InMemoryDataSource);
|
||||
NS_IMPL_RELEASE(InMemoryDataSource);
|
||||
|
||||
NS_IMETHODIMP
|
||||
InMemoryDataSource::QueryInterface(REFNSIID iid, void** result)
|
||||
NS_NewRDFInMemoryDataSource(nsISupports* aOuter, const nsIID& aIID, void** aResult)
|
||||
{
|
||||
NS_PRECONDITION(result != nsnull, "null ptr");
|
||||
if (! result)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
NS_PRECONDITION(aResult != nsnull, "null ptr");
|
||||
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
InMemoryDataSource* datasource = new InMemoryDataSource(aOuter);
|
||||
if (! datasource)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
if (iid.Equals(kISupportsIID) ||
|
||||
iid.Equals(nsIRDFDataSource::GetIID())) {
|
||||
*result = NS_STATIC_CAST(nsIRDFDataSource*, this);
|
||||
}
|
||||
else if (iid.Equals(nsIRDFPurgeableDataSource::GetIID())) {
|
||||
*result = NS_STATIC_CAST(nsIRDFPurgeableDataSource*, this);
|
||||
}
|
||||
else {
|
||||
*result = nsnull;
|
||||
return NS_NOINTERFACE;
|
||||
nsresult rv;
|
||||
|
||||
rv = datasource->Init();
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
rv = datasource->QueryInterface(aIID, aResult); // This'll AddRef()
|
||||
|
||||
if (NS_SUCCEEDED(rv))
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_ADDREF(this);
|
||||
return NS_OK;
|
||||
delete datasource;
|
||||
*aResult = nsnull;
|
||||
return rv;
|
||||
}
|
||||
|
||||
InMemoryDataSource::InMemoryDataSource(void)
|
||||
|
||||
|
||||
InMemoryDataSource::InMemoryDataSource(nsISupports* aOuter)
|
||||
: mURL(nsnull),
|
||||
mForwardArcs(nsnull),
|
||||
mReverseArcs(nsnull),
|
||||
mObservers(nsnull),
|
||||
mLock(nsnull)
|
||||
mLock(nsnull),
|
||||
mOuter(aOuter)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
}
|
||||
|
||||
|
||||
nsresult
|
||||
InMemoryDataSource::Init()
|
||||
{
|
||||
mForwardArcs = PL_NewHashTable(kInitialTableSize,
|
||||
rdf_HashPointer,
|
||||
|
|
@ -613,6 +625,9 @@ InMemoryDataSource::InMemoryDataSource(void)
|
|||
nsnull,
|
||||
nsnull);
|
||||
|
||||
if (! mForwardArcs)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
mReverseArcs = PL_NewHashTable(kInitialTableSize,
|
||||
rdf_HashPointer,
|
||||
rdf_CompareNodes,
|
||||
|
|
@ -620,17 +635,23 @@ InMemoryDataSource::InMemoryDataSource(void)
|
|||
nsnull,
|
||||
nsnull);
|
||||
|
||||
mLock = PR_NewLock();
|
||||
if (! mReverseArcs)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
NS_INIT_REFCNT();
|
||||
mLock = PR_NewLock();
|
||||
if (! mLock)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
#ifdef PR_LOGGING
|
||||
if (! gLog)
|
||||
gLog = PR_NewLogModule("InMemoryDataSource");
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
InMemoryDataSource::~InMemoryDataSource(void)
|
||||
|
||||
InMemoryDataSource::~InMemoryDataSource()
|
||||
{
|
||||
if (mForwardArcs) {
|
||||
// This'll release all of the Assertion objects that are
|
||||
|
|
@ -669,6 +690,65 @@ InMemoryDataSource::DeleteForwardArcsEntry(PLHashEntry* he, PRIntn i, void* arg)
|
|||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
NS_IMETHODIMP_(nsrefcnt)
|
||||
InMemoryDataSource::AddRef()
|
||||
{
|
||||
if (mOuter) {
|
||||
return mOuter->AddRef();
|
||||
}
|
||||
else {
|
||||
return ++mRefCnt;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP_(nsrefcnt)
|
||||
InMemoryDataSource::Release()
|
||||
{
|
||||
if (mOuter) {
|
||||
return mOuter->Release();
|
||||
}
|
||||
else if (--mRefCnt == 0) {
|
||||
delete this;
|
||||
}
|
||||
return mRefCnt;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
InMemoryDataSource::QueryInterface(REFNSIID aIID, void** aResult)
|
||||
{
|
||||
NS_PRECONDITION(aResult != nsnull, "null ptr");
|
||||
if (! aResult)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
|
||||
if (aIID.Equals(nsIRDFDataSource::GetIID()) ||
|
||||
((!mOuter && aIID.Equals(kISupportsIID)))) {
|
||||
*aResult = NS_STATIC_CAST(nsIRDFDataSource*, this);
|
||||
}
|
||||
else if (aIID.Equals(nsIRDFPurgeableDataSource::GetIID())) {
|
||||
*aResult = NS_STATIC_CAST(nsIRDFPurgeableDataSource*, this);
|
||||
}
|
||||
else if (mOuter) {
|
||||
return mOuter->QueryInterface(aIID, aResult);
|
||||
}
|
||||
else {
|
||||
*aResult = nsnull;
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
NS_ADDREF(this);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
Assertion*
|
||||
InMemoryDataSource::GetForwardArcs(nsIRDFResource* u)
|
||||
{
|
||||
|
|
@ -1474,15 +1554,3 @@ InMemoryDataSource::SweepForwardArcsEntries(PLHashEntry* he, PRIntn i, void* arg
|
|||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
nsresult NS_NewRDFInMemoryDataSource(nsIRDFDataSource** result);
|
||||
nsresult
|
||||
NS_NewRDFInMemoryDataSource(nsIRDFDataSource** result)
|
||||
{
|
||||
InMemoryDataSource* ds = new InMemoryDataSource();
|
||||
if (! ds)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
*result = ds;
|
||||
NS_ADDREF(*result);
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@
|
|||
class nsIRDFDataSource;
|
||||
|
||||
// in nsInMemoryDataSource.cpp
|
||||
nsresult NS_NewRDFInMemoryDataSource(nsIRDFDataSource** result);
|
||||
NS_IMETHODIMP
|
||||
NS_NewRDFInMemoryDataSource(nsISupports* aOuter, const nsIID& aIID, void** aResult);
|
||||
|
||||
#endif // nsBaseDataSources_h__
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
*/
|
||||
|
||||
#include "nsIFactory.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsILocalStore.h"
|
||||
#include "nsIRDFContainer.h"
|
||||
#include "nsIRDFContainerUtils.h"
|
||||
|
|
@ -53,6 +54,7 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
|
|||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
|
||||
|
||||
static NS_DEFINE_CID(kGenericFactoryCID, NS_GENERICFACTORY_CID);
|
||||
static NS_DEFINE_CID(kLocalStoreCID, NS_LOCALSTORE_CID);
|
||||
static NS_DEFINE_CID(kRDFBookmarkDataSourceCID, NS_RDFBOOKMARKDATASOURCE_CID);
|
||||
static NS_DEFINE_CID(kRDFCompositeDataSourceCID, NS_RDFCOMPOSITEDATASOURCE_CID);
|
||||
|
|
@ -154,6 +156,7 @@ RDFFactoryImpl::CreateInstance(nsISupports *aOuter,
|
|||
if (! aResult)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
|
||||
if (aOuter)
|
||||
return NS_ERROR_NO_AGGREGATION;
|
||||
|
||||
|
|
@ -178,11 +181,6 @@ RDFFactoryImpl::CreateInstance(nsISupports *aOuter,
|
|||
if (NS_FAILED(rv = NS_NewXULFocusTracker((nsIXULFocusTracker**) &inst)))
|
||||
return rv;
|
||||
}
|
||||
else if (mClassID.Equals(kRDFInMemoryDataSourceCID)) {
|
||||
|
||||
if (NS_FAILED(rv = NS_NewRDFInMemoryDataSource((nsIRDFDataSource**) &inst)))
|
||||
return rv;
|
||||
}
|
||||
else if (mClassID.Equals(kRDFXMLDataSourceCID)) {
|
||||
if (NS_FAILED(rv = NS_NewRDFXMLDataSource((nsIRDFXMLDataSource**) &inst)))
|
||||
return rv;
|
||||
|
|
@ -297,7 +295,7 @@ nsresult RDFFactoryImpl::LockFactory(PRBool aLock)
|
|||
|
||||
// return the proper factory to the caller
|
||||
extern "C" PR_IMPLEMENT(nsresult)
|
||||
NSGetFactory(nsISupports* aServMgr,
|
||||
NSGetFactory(nsISupports* aServiceMgr,
|
||||
const nsCID &aClass,
|
||||
const char *aClassName,
|
||||
const char *aProgID,
|
||||
|
|
@ -306,12 +304,39 @@ NSGetFactory(nsISupports* aServMgr,
|
|||
if (! aFactory)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
||||
RDFFactoryImpl* factory = new RDFFactoryImpl(aClass, aClassName, aProgID);
|
||||
if (factory == nsnull)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
if (aClass.Equals(kRDFInMemoryDataSourceCID)) {
|
||||
nsIGenericFactory::ConstructorProcPtr constructor;
|
||||
|
||||
constructor = NS_NewRDFInMemoryDataSource;
|
||||
|
||||
// XXX Factor this part out if we get more of these
|
||||
nsresult rv;
|
||||
NS_WITH_SERVICE1(nsIComponentManager, compMgr, aServiceMgr, kComponentManagerCID, &rv);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
nsCOMPtr<nsIGenericFactory> factory;
|
||||
rv = compMgr->CreateInstance(kGenericFactoryCID,
|
||||
nsnull,
|
||||
nsIGenericFactory::GetIID(),
|
||||
getter_AddRefs(factory));
|
||||
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
rv = factory->SetConstructor(constructor);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
*aFactory = factory;
|
||||
NS_ADDREF(*aFactory);
|
||||
}
|
||||
else {
|
||||
RDFFactoryImpl* factory = new RDFFactoryImpl(aClass, aClassName, aProgID);
|
||||
if (factory == nsnull)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
NS_ADDREF(factory);
|
||||
*aFactory = factory;
|
||||
}
|
||||
|
||||
NS_ADDREF(factory);
|
||||
*aFactory = factory;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,12 +52,6 @@ nsresult NS_NewRDFFTPDataSource(nsIRDFDataSource** result);
|
|||
// in nsRelatedLinksDataSource.cpp
|
||||
nsresult NS_NewRDFRelatedLinksDataSource(nsIRDFDataSource **result);
|
||||
|
||||
// in nsMemoryDataSource.cpp
|
||||
nsresult NS_NewRDFInMemoryDataSource(nsIRDFDataSource** result);
|
||||
|
||||
// in nsStreamDataSource.cpp
|
||||
nsresult NS_NewRDFStreamDataSource(nsIRDFDataSource** result);
|
||||
|
||||
#endif // nsBuiltinDataSources_h__
|
||||
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче