summaryrefslogtreecommitdiffstats
path: root/dom/performance/PerformanceMainThread.h
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-02-20 12:00:26 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:47:56 +0200
commit009c9dd2f82445de79cfedf03ddd8d321df9b69b (patch)
treebd5f8904957e6feb63af35b8008cd3ac9ada9647 /dom/performance/PerformanceMainThread.h
parent6407f1abd4f2f598f42cd416d7de9345c77e2444 (diff)
downloadUXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.gz
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.lz
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.tar.xz
UXP-009c9dd2f82445de79cfedf03ddd8d321df9b69b.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.h')
-rw-r--r--dom/performance/PerformanceMainThread.h8
1 files changed, 8 insertions, 0 deletions
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