diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /toolkit/components/backgroundhangmonitor | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-adbda400be353e676059e335c3c0aaf99e719475.tar.xz firefox-adbda400be353e676059e335c3c0aaf99e719475.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/backgroundhangmonitor')
-rw-r--r-- | toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp | 3 | ||||
-rw-r--r-- | toolkit/components/backgroundhangmonitor/ThreadStackHelper.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp index c43a322fd4..889f7c96f1 100644 --- a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp +++ b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp @@ -205,7 +205,8 @@ void ThreadStackHelper::CollectJitReturnAddr(void* aAddr) { TryAppendFrame(HangEntryJit()); } -void ThreadStackHelper::CollectWasmFrame(const char* aLabel) { +void ThreadStackHelper::CollectWasmFrame(JS::ProfilingCategoryPair aCategory, + const char* aLabel) { MOZ_RELEASE_ASSERT(mStackToFill); // We don't want to collect WASM frames, as they are probably for content, so // we just add a "(content wasm)" frame. diff --git a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.h b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.h index e54078d2dd..e55ba2cab9 100644 --- a/toolkit/components/backgroundhangmonitor/ThreadStackHelper.h +++ b/toolkit/components/backgroundhangmonitor/ThreadStackHelper.h @@ -92,7 +92,8 @@ class ThreadStackHelper : public ProfilerStackCollector { virtual void SetIsMainThread() override; virtual void CollectNativeLeafAddr(void* aAddr) override; virtual void CollectJitReturnAddr(void* aAddr) override; - virtual void CollectWasmFrame(const char* aLabel) override; + virtual void CollectWasmFrame(JS::ProfilingCategoryPair aCategory, + const char* aLabel) override; virtual void CollectProfilingStackFrame( const js::ProfilingStackFrame& aEntry) override; |