mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 23:02:20 +00:00
Backed out changeset 65f8b0434e1e (bug 1708580) for causing Btime failures. CLOSED TREE
This commit is contained in:
parent
e667f33046
commit
a831b7db56
@ -587,11 +587,6 @@ public class GeckoThread extends Thread {
|
||||
return isStateAtLeast(minState) && isStateAtMost(maxState);
|
||||
}
|
||||
|
||||
@WrapForJNI(calledFrom = "gecko")
|
||||
private static int getStateOrdinal() {
|
||||
return ((State)sNativeQueue.getState()).ordinal();
|
||||
}
|
||||
|
||||
@WrapForJNI(calledFrom = "gecko")
|
||||
private static void setState(final State newState) {
|
||||
checkAndSetState(null, newState);
|
||||
|
@ -298,11 +298,6 @@ ExperimentalFeatures:
|
||||
type: string
|
||||
ping: true
|
||||
|
||||
GeckoViewThreadState:
|
||||
description: >
|
||||
The zero-based ordinal of the GeckoThread.State at the time of the crash.
|
||||
type: integer
|
||||
|
||||
GetHGlobalFromStreamFailure:
|
||||
description: >
|
||||
Error returned when invoking GetHGlobalFromStreamFailure() during the
|
||||
|
@ -541,17 +541,6 @@ nsAppShell::Observe(nsISupports* aSubject, const char* aTopic,
|
||||
}
|
||||
} else if (!strcmp(aTopic, "quit-application")) {
|
||||
if (jni::IsAvailable()) {
|
||||
#if defined(EARLY_BETA_OR_EARLIER)
|
||||
const int curGeckoThreadState = java::GeckoThread::GetStateOrdinal();
|
||||
CrashReporter::AnnotateCrashReport(
|
||||
CrashReporter::Annotation::GeckoViewThreadState, curGeckoThreadState);
|
||||
|
||||
const char* isInAutomation = PR_GetEnv("MOZ_IN_AUTOMATION");
|
||||
if (!isInAutomation || !(*isInAutomation)) {
|
||||
MOZ_CRASH("Something triggered the \"quit-application\" notification!");
|
||||
}
|
||||
#endif // defined(EARLY_BETA_OR_EARLIER)
|
||||
|
||||
const bool restarting = aData && u"restart"_ns.Equals(aData);
|
||||
java::GeckoThread::SetState(restarting
|
||||
? java::GeckoThread::State::RESTARTING()
|
||||
|
Loading…
Reference in New Issue
Block a user