wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-28 01:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #316 - Be more gentle with the CC and nursery.

Browse source
This commit is contained in:
wolfbeast 2020-02-20 16:47:04 +01:00 • committed by Roy Tam
commit 10e1c09fec
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dom/performance/PerformanceMainThread.cpp
View file

@ -11,7 +11,7 @@
namespace mozilla { namespace mozilla {
namespace dom { namespace dom {
#ifdef MOZ_DEVTOOLS_SERVER
NS_IMPL_CYCLE_COLLECTION_CLASS(PerformanceMainThread) NS_IMPL_CYCLE_COLLECTION_CLASS(PerformanceMainThread)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread, NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread,
@ -19,8 +19,10 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread,
NS_IMPL_CYCLE_COLLECTION_UNLINK(mTiming, NS_IMPL_CYCLE_COLLECTION_UNLINK(mTiming,
mNavigation, mNavigation,
mDocEntry) mDocEntry)
#ifdef MOZ_DEVTOOLS_SERVER
tmp->mMozMemory = nullptr; tmp->mMozMemory = nullptr;
mozilla::DropJSObjects(this); mozilla::DropJSObjects(this);
#endif
NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PerformanceMainThread, NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PerformanceMainThread,
@ -32,15 +34,13 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PerformanceMainThread, NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PerformanceMainThread,
Performance) Performance)
#ifdef MOZ_DEVTOOLS_SERVER
NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mMozMemory) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mMozMemory)
#endif
NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_CYCLE_COLLECTION_TRACE_END
NS_IMPL_ADDREF_INHERITED(PerformanceMainThread, Performance) NS_IMPL_ADDREF_INHERITED(PerformanceMainThread, Performance)
NS_IMPL_RELEASE_INHERITED(PerformanceMainThread, Performance) NS_IMPL_RELEASE_INHERITED(PerformanceMainThread, Performance)
#else
NS_IMPL_CYCLE_COLLECTION_INHERITED(PerformanceMainThread, Performance
mTiming, mNavigation, mDocEntry)
#endif
// QueryInterface implementation for PerformanceMainThread // QueryInterface implementation for PerformanceMainThread
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PerformanceMainThread) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PerformanceMainThread)

4
dom/performance/PerformanceMainThread.h
View file

@ -20,12 +20,8 @@ public:
nsITimedChannel* aChannel); nsITimedChannel* aChannel);
NS_DECL_ISUPPORTS_INHERITED NS_DECL_ISUPPORTS_INHERITED
#ifdef MOZ_DEVTOOLS_SERVER
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(PerformanceMainThread, NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(PerformanceMainThread,
Performance) Performance)
#else
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PerformanceMainThread, Performance)
#endif
virtual PerformanceTiming* Timing() override; virtual PerformanceTiming* Timing() override;

4
js/src/jsgc.cpp
View file

@ -6776,9 +6776,9 @@ js::gc::NextCellUniqueId(JSRuntime* rt)
return rt->gc.nextCellUniqueId(); return rt->gc.nextCellUniqueId();
} }
#ifdef MOZ_DEVTOOLS_SERVER
namespace js { namespace js {
namespace gc { namespace gc {
#ifdef MOZ_DEVTOOLS_SERVER
namespace MemInfo { namespace MemInfo {
static bool static bool
@ -6994,6 +6994,7 @@ NewMemoryInfoObject(JSContext* cx)
return obj; return obj;
} }
#endif // MOZ_DEVTOOLS_SERVER
const char* const char*
StateName(State state) StateName(State state)
@ -7033,7 +7034,6 @@ AutoEmptyNursery::AutoEmptyNursery(JSRuntime *rt)
} /* namespace gc */ } /* namespace gc */
} /* namespace js */ } /* namespace js */
#endif
#ifdef DEBUG #ifdef DEBUG
void void