From 009c9dd2f82445de79cfedf03ddd8d321df9b69b 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.h | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/dom/performance/PerformanceMainThread.h b/dom/performance/PerformanceMainThread.h
index 9f0e185fc..68b306d93 100644
--- a/dom/performance/PerformanceMainThread.h
+++ b/dom/performance/PerformanceMainThread.h
@@ -20,8 +20,12 @@ public:
                         nsITimedChannel* aChannel);
 
   NS_DECL_ISUPPORTS_INHERITED
+#ifdef MOZ_DEVTOOLS_SERVER
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(PerformanceMainThread,
                                                          Performance)
+#else
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PerformanceMainThread, Performance)
+#endif
 
   virtual PerformanceTiming* Timing() override;
 
@@ -34,8 +38,10 @@ public:
 
   DOMHighResTimeStamp CreationTime() const override;
 
+#ifdef MOZ_DEVTOOLS_SERVER
   virtual void GetMozMemory(JSContext *aCx,
                             JS::MutableHandle<JSObject*> aObj) override;
+#endif
 
   virtual nsDOMNavigationTiming* GetDOMTiming() const override
   {
@@ -79,7 +85,9 @@ protected:
   nsCOMPtr<nsITimedChannel> mChannel;
   RefPtr<PerformanceTiming> mTiming;
   RefPtr<PerformanceNavigation> mNavigation;
+#ifdef MOZ_DEVTOOLS_SERVER
   JS::Heap<JSObject*> mMozMemory;
+#endif
 };
 
 } // namespace dom
-- 
cgit v1.2.3


From 201be4d8fcd78484ad2132d16fd5c06448a41aca Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Thu, 20 Feb 2020 16:47:04 +0100
Subject: Issue #316 - Be more gentle with the CC and nursery.

---
 dom/performance/PerformanceMainThread.h | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/dom/performance/PerformanceMainThread.h b/dom/performance/PerformanceMainThread.h
index 68b306d93..a90a53520 100644
--- a/dom/performance/PerformanceMainThread.h
+++ b/dom/performance/PerformanceMainThread.h
@@ -20,12 +20,8 @@ public:
                         nsITimedChannel* aChannel);
 
   NS_DECL_ISUPPORTS_INHERITED
-#ifdef MOZ_DEVTOOLS_SERVER
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(PerformanceMainThread,
                                                          Performance)
-#else
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PerformanceMainThread, Performance)
-#endif
 
   virtual PerformanceTiming* Timing() override;
 
-- 
cgit v1.2.3