diff options
| author | Moonchild <mcwerewolf@wolfbeast.com> | 2019-03-13 07:49:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 07:49:07 +0100 |
| commit | bf0413359245579e9509146d42cd5547e35da695 (patch) | |
| tree | 8218d4f60d9eccacbf42df8cb88094a082d401b4 /xpcom/base/nsCycleCollector.cpp | |
| parent | 51b821b3fdc5a7eab2369cb6a6680598a6264b08 (diff) | |
| parent | 709bc24e9110eba12f94cfcb8db00a8338ac4098 (diff) | |
| download | UXP-bf0413359245579e9509146d42cd5547e35da695.tar UXP-bf0413359245579e9509146d42cd5547e35da695.tar.gz UXP-bf0413359245579e9509146d42cd5547e35da695.tar.lz UXP-bf0413359245579e9509146d42cd5547e35da695.tar.xz UXP-bf0413359245579e9509146d42cd5547e35da695.zip | |
Merge pull request #998 from MoonchildProductions/master
Merge master into Sync-weave
Diffstat (limited to 'xpcom/base/nsCycleCollector.cpp')
| -rw-r--r-- | xpcom/base/nsCycleCollector.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index 7109d85bd..06ed42326 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -185,7 +185,6 @@ #include "mozilla/AutoGlobalTimelineMarker.h" #include "mozilla/Likely.h" #include "mozilla/PoisonIOInterposer.h" -#include "mozilla/Telemetry.h" #include "mozilla/ThreadLocal.h" using namespace mozilla; @@ -2266,7 +2265,7 @@ CCGraphBuilder::BuildGraph(SliceBudget& aBudget) SetFirstChild(); if (pi->mParticipant) { - nsresult rv = pi->mParticipant->Traverse(pi->mPointer, *this); + nsresult rv = pi->mParticipant->TraverseNativeAndJS(pi->mPointer, *this); MOZ_RELEASE_ASSERT(!NS_FAILED(rv), "Cycle collector Traverse method failed"); } @@ -2540,7 +2539,7 @@ static bool MayHaveChild(void* aObj, nsCycleCollectionParticipant* aCp) { ChildFinder cf; - aCp->Traverse(aObj, cf); + aCp->TraverseNativeAndJS(aObj, cf); return cf.MayHaveChild(); } @@ -2597,7 +2596,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(JSPurpleBuffer) CycleCollectionNoteChild(cb, tmp, "self"); - NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END #define NS_TRACE_SEGMENTED_ARRAY(_field, _type) \ @@ -3488,7 +3486,6 @@ nsCycleCollector::FixGrayBits(bool aForceGC, TimeLog& aTimeLog) aTimeLog.Checkpoint("FixWeakMappingGrayBits"); bool needGC = !mJSContext->AreGCGrayBitsValid(); - // Only do a telemetry ping for non-shutdown CCs. if (!needGC) { return; } @@ -3540,8 +3537,6 @@ nsCycleCollector::CleanupAfterCollection() printf(".\ncc: \n"); #endif - timeLog.Checkpoint("CleanupAfterCollection::telemetry"); - if (mJSContext) { mJSContext->FinalizeDeferredThings(mResults.mAnyManual ? CycleCollectedJSContext::FinalizeNow |