diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-20 12:00:26 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-02-20 12:00:26 +0100 |
| commit | 59f7a2cdb4f36f017586aa139a7fe8def39e777b (patch) | |
| tree | 45779e58d11a2e540cb7db858c383d4471ab475b /dom/performance/PerformanceMainThread.cpp | |
| parent | e3d81b698ea104e4b55ee618b931ea1311c04169 (diff) | |
| download | UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.gz UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.lz UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.tar.xz UXP-59f7a2cdb4f36f017586aa139a7fe8def39e777b.zip | |
Issue #316 - Make the memory GC performance object conditional (WIP)
This was only added for GCubench and likely interfering with building
without devtools-server.
Diffstat (limited to 'dom/performance/PerformanceMainThread.cpp')
| -rw-r--r-- | dom/performance/PerformanceMainThread.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dom/performance/PerformanceMainThread.cpp b/dom/performance/PerformanceMainThread.cpp index 5a84f5fb1..4c800005f 100644 --- a/dom/performance/PerformanceMainThread.cpp +++ b/dom/performance/PerformanceMainThread.cpp @@ -11,6 +11,7 @@ namespace mozilla { namespace dom { +#ifdef MOZ_DEVTOOLS_SERVER NS_IMPL_CYCLE_COLLECTION_CLASS(PerformanceMainThread) NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread, @@ -36,6 +37,10 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END NS_IMPL_ADDREF_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 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PerformanceMainThread) @@ -55,9 +60,12 @@ PerformanceMainThread::PerformanceMainThread(nsPIDOMWindowInner* aWindow, PerformanceMainThread::~PerformanceMainThread() { +#ifdef MOZ_DEVTOOLS_SERVER mozilla::DropJSObjects(this); +#endif } +#ifdef MOZ_DEVTOOLS_SERVER void PerformanceMainThread::GetMozMemory(JSContext *aCx, JS::MutableHandle<JSObject*> aObj) @@ -71,6 +79,7 @@ PerformanceMainThread::GetMozMemory(JSContext *aCx, aObj.set(mMozMemory); } +#endif PerformanceTiming* PerformanceMainThread::Timing() |