Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 65f8b0434e1e (bug 1708580) for causing Btime failures. CLOSED TREE

Browse Source
This commit is contained in:
Marian-Vasile Laza 2021-08-14 00:44:48 +03:00
parent e667f33046
commit a831b7db56
3 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
View File

@ -587,11 +587,6 @@ public class GeckoThread extends Thread {
return isStateAtLeast(minState) && isStateAtMost(maxState); return isStateAtLeast(minState) && isStateAtMost(maxState);
} }
@WrapForJNI(calledFrom = "gecko")
private static int getStateOrdinal() {
return ((State)sNativeQueue.getState()).ordinal();
}
@WrapForJNI(calledFrom = "gecko") @WrapForJNI(calledFrom = "gecko")
private static void setState(final State newState) { private static void setState(final State newState) {
checkAndSetState(null, newState); checkAndSetState(null, newState);

5
toolkit/crashreporter/CrashAnnotations.yaml
View File

@ -298,11 +298,6 @@ ExperimentalFeatures:
type: string type: string
ping: true ping: true
GeckoViewThreadState:
description: >
The zero-based ordinal of the GeckoThread.State at the time of the crash.
type: integer
GetHGlobalFromStreamFailure: GetHGlobalFromStreamFailure:
description: > description: >
Error returned when invoking GetHGlobalFromStreamFailure() during the Error returned when invoking GetHGlobalFromStreamFailure() during the

11
widget/android/nsAppShell.cpp
View File

@ -541,17 +541,6 @@ nsAppShell::Observe(nsISupports* aSubject, const char* aTopic,
} }
} else if (!strcmp(aTopic, "quit-application")) { } else if (!strcmp(aTopic, "quit-application")) {
if (jni::IsAvailable()) { 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); const bool restarting = aData && u"restart"_ns.Equals(aData);
java::GeckoThread::SetState(restarting java::GeckoThread::SetState(restarting
? java::GeckoThread::State::RESTARTING() ? java::GeckoThread::State::RESTARTING()