corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1393915 - Deduplicate consecutive (content script) frames, r=froydnj

Browse Source
This commit is contained in:
Michael Layzell
2017-08-25 14:25:54 -04:00
parent fcc76a9242
commit a9d4caa44d
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/components/backgroundhangmonitor/ThreadStackHelper.cpp
View File

@@ -247,6 +247,10 @@ GetPathAfterComponent(const char* filename, const char (&component)[LEN]) {
void
ThreadStackHelper::CollectPseudoEntry(const js::ProfileEntry& aEntry)
{
HangStack::Frame* backFrame = mStackToFill->empty()
? nullptr
: &mStackToFill->back();
// For non-js frames we just include the raw label.
if (!aEntry.isJs()) {
const char* label = aEntry.label();
@@ -260,6 +264,12 @@ ThreadStackHelper::CollectPseudoEntry(const js::ProfileEntry& aEntry)
}
if (!IsChromeJSScript(aEntry.script())) {
// NOTE: Deduplicate consecutive (content script) frames.
if (backFrame &&
backFrame->GetKind() == HangStack::Frame::Kind::STRING &&
!strcmp(backFrame->AsString(), "(content script)")) {
return;
}
TryAppendFrame(HangStack::Frame("(content script)"));
return;
}