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

Backed out changeset 531593bacc4e (bug 1448040) for Android build bustages on HangAnnotations.h. CLOSED TREE

Browse Source
This commit is contained in:
Cosmin Sabou
2018-06-07 19:22:31 +03:00
parent 1608fbfdd3
commit 65e12679b2
47 changed files with 1400 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dom/plugins/ipc/PluginModuleParent.cpp
View File

@@ -9,7 +9,6 @@
#include "base/process_util.h"
#include "mozilla/Attributes.h"
#include "mozilla/AutoRestore.h"
#include "mozilla/BackgroundHangMonitor.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/ContentChild.h"
#include "mozilla/ipc/CrashReporterClient.h"
@@ -657,7 +656,7 @@ PluginModuleChromeParent::PluginModuleChromeParent(const char* aFilePath,
mSandboxLevel = aSandboxLevel;
mRunID = GeckoChildProcessHost::GetUniqueID();
mozilla::BackgroundHangMonitor::RegisterAnnotator(*this);
mozilla::HangMonitor::RegisterAnnotator(*this);
}
PluginModuleChromeParent::~PluginModuleChromeParent()
@@ -710,7 +709,7 @@ PluginModuleChromeParent::~PluginModuleChromeParent()
}
#endif
mozilla::BackgroundHangMonitor::UnregisterAnnotator(*this);
mozilla::HangMonitor::UnregisterAnnotator(*this);
}
void
@@ -989,16 +988,16 @@ PluginModuleChromeParent::ExitedCxxStack()
}
/**
* This function is always called by the BackgroundHangMonitor thread.
* This function is always called by the HangMonitor thread.
*/
void
PluginModuleChromeParent::AnnotateHang(mozilla::BackgroundHangAnnotations& aAnnotations)
PluginModuleChromeParent::AnnotateHang(mozilla::HangMonitor::HangAnnotations& aAnnotations)
{
uint32_t flags = mHangAnnotationFlags;
if (flags) {
/* We don't actually annotate anything specifically for kInPluginCall;
we use it to determine whether to annotate other things. It will
be pretty obvious from the hang stack that we're in a plugin
be pretty obvious from the ChromeHang stack that we're in a plugin
call when the hang occurred. */
if (flags & kHangUIShown) {
aAnnotations.AddAnnotation(NS_LITERAL_STRING("HangUIShown"),