From 59f7a2cdb4f36f017586aa139a7fe8def39e777b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Thu, 20 Feb 2020 12:00:26 +0100
Subject: Issue #316 - Make the memory GC performance object conditional (WIP)

This was only added for GCubench and likely interfering with building
without devtools-server.
---
 dom/performance/PerformanceMainThread.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'dom/performance/PerformanceMainThread.cpp')

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()
-- 
cgit v1.2.3