wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1166598 (part 4) - Use PLDHashTable2 in RDFServiceImpl. r=froydnj.

Browse Source
This commit is contained in:
Nicholas Nethercote 2015-05-05 18:30:27 -07:00
parent ff4aa2cbfd
commit 0c7ca68cbe
2 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rdf/base/nsRDFService.cpp
View File

@ -719,7 +719,12 @@ RDFServiceImpl*
RDFServiceImpl::gRDFService;
RDFServiceImpl::RDFServiceImpl()
: mNamedDataSources(nullptr)
: mNamedDataSources(nullptr)
, mResources(&gResourceTableOps, sizeof(ResourceHashEntry))
, mLiterals(&gLiteralTableOps, sizeof(LiteralHashEntry))
, mInts(&gIntTableOps, sizeof(IntHashEntry))
, mDates(&gDateTableOps, sizeof(DateHashEntry))
, mBlobs(&gBlobTableOps, sizeof(BlobHashEntry))
{
gRDFService = this;
}
@ -738,17 +743,6 @@ RDFServiceImpl::Init()
if (! mNamedDataSources)
return NS_ERROR_OUT_OF_MEMORY;
PL_DHashTableInit(&mResources, &gResourceTableOps,
sizeof(ResourceHashEntry));
PL_DHashTableInit(&mLiterals, &gLiteralTableOps, sizeof(LiteralHashEntry));
PL_DHashTableInit(&mInts, &gIntTableOps, sizeof(IntHashEntry));
PL_DHashTableInit(&mDates, &gDateTableOps, sizeof(DateHashEntry));
PL_DHashTableInit(&mBlobs, &gBlobTableOps, sizeof(BlobHashEntry));
mDefaultResourceFactory = do_GetClassObject(kRDFDefaultResourceCID, &rv);
NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get default resource factory");
if (NS_FAILED(rv)) return rv;
@ -766,16 +760,6 @@ RDFServiceImpl::~RDFServiceImpl()
PL_HashTableDestroy(mNamedDataSources);
mNamedDataSources = nullptr;
}
if (mResources.IsInitialized())
PL_DHashTableFinish(&mResources);
if (mLiterals.IsInitialized())
PL_DHashTableFinish(&mLiterals);
if (mInts.IsInitialized())
PL_DHashTableFinish(&mInts);
if (mDates.IsInitialized())
PL_DHashTableFinish(&mDates);
if (mBlobs.IsInitialized())
PL_DHashTableFinish(&mBlobs);
gRDFService = nullptr;
}
@ -793,9 +777,6 @@ RDFServiceImpl::CreateSingleton(nsISupports* aOuter,
}
nsRefPtr<RDFServiceImpl> serv = new RDFServiceImpl();
if (!serv)
return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = serv->Init();
if (NS_FAILED(rv))
return rv;

10
rdf/base/nsRDFService.h
View File

@ -38,11 +38,11 @@ class RDFServiceImpl final : public nsIRDFService,
{
protected:
PLHashTable* mNamedDataSources;
PLDHashTable mResources;
PLDHashTable mLiterals;
PLDHashTable mInts;
PLDHashTable mDates;
PLDHashTable mBlobs;
PLDHashTable2 mResources;
PLDHashTable2 mLiterals;
PLDHashTable2 mInts;
PLDHashTable2 mDates;
PLDHashTable2 mBlobs;
nsAutoCString mLastURIPrefix;
nsCOMPtr<nsIFactory> mLastFactory;