diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /dom/performance/PerformanceMainThread.h | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'dom/performance/PerformanceMainThread.h')
| -rw-r--r-- | dom/performance/PerformanceMainThread.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/performance/PerformanceMainThread.h b/dom/performance/PerformanceMainThread.h index 9f0e185fc..a90a53520 100644 --- a/dom/performance/PerformanceMainThread.h +++ b/dom/performance/PerformanceMainThread.h @@ -34,8 +34,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 +81,9 @@ protected: nsCOMPtr<nsITimedChannel> mChannel; RefPtr<PerformanceTiming> mTiming; RefPtr<PerformanceNavigation> mNavigation; +#ifdef MOZ_DEVTOOLS_SERVER JS::Heap<JSObject*> mMozMemory; +#endif }; } // namespace dom |