author | Andrew McCreight <continuation@gmail.com> |
Tue, 10 Sep 2013 08:56:35 -0700 | |
changeset 146438 | 8ac551efe4e110a439212a70002807fa1b7e9bac |
parent 146437 | 50f93200b17607796f95476e4e251310335af888 |
child 146439 | d722282fdc4dde056610a04cb4db82c16e018aac |
push id | 25260 |
push user | ryanvm@gmail.com |
push date | Wed, 11 Sep 2013 00:29:30 +0000 |
treeherder | mozilla-central@f73bed2856a8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | smaug |
bugs | 913881 |
milestone | 26.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -1563,17 +1563,17 @@ public: bool WantAllTraces() const { return nsCycleCollectionNoteRootCallback::WantAllTraces(); } uint32_t Count() const { return mPtrToNodeMap.entryCount; } - PtrInfo* AddNode(void *s, nsCycleCollectionParticipant *aParticipant); + PtrInfo* AddNode(void *aPtr, nsCycleCollectionParticipant *aParticipant); PtrInfo* AddWeakMapNode(void* node); void Traverse(PtrInfo* aPtrInfo); void SetLastChild(); bool RanOutOfMemory() const { return mRanOutOfMemory; } private: void DescribeNode(uint32_t refCount, const char *objName) @@ -1682,28 +1682,28 @@ GCGraphBuilder::GCGraphBuilder(nsCycleCo GCGraphBuilder::~GCGraphBuilder() { if (mPtrToNodeMap.ops) PL_DHashTableFinish(&mPtrToNodeMap); } PtrInfo* -GCGraphBuilder::AddNode(void *s, nsCycleCollectionParticipant *aParticipant) +GCGraphBuilder::AddNode(void *aPtr, nsCycleCollectionParticipant *aParticipant) { - PtrToNodeEntry *e = static_cast<PtrToNodeEntry*>(PL_DHashTableOperate(&mPtrToNodeMap, s, PL_DHASH_ADD)); + PtrToNodeEntry *e = static_cast<PtrToNodeEntry*>(PL_DHashTableOperate(&mPtrToNodeMap, aPtr, PL_DHASH_ADD)); if (!e) { mRanOutOfMemory = true; return nullptr; } PtrInfo *result; if (!e->mNode) { // New entry. - result = mNodeBuilder.Add(s, aParticipant); + result = mNodeBuilder.Add(aPtr, aParticipant); e->mNode = result; NS_ASSERTION(result, "mNodeBuilder.Add returned null"); } else { result = e->mNode; MOZ_ASSERT(result->mParticipant == aParticipant, "nsCycleCollectionParticipant shouldn't change!"); } return result;