Backed out changeset 65f8b0434e1e (bug 1708580) for causing Btime failures. CLOSED TREE
authorMarian-Vasile Laza <mlaza@mozilla.com>
Sat, 14 Aug 2021 00:44:48 +0300
changeset 588877 df4b218d495a2b4e86b913ca571e3d2d28f2245d
parent 588871 50435d7ca25a9bebc09e0efb68b27d99ca40e0fd
child 588878 c77107cec728a22f7253e18d041fe84d67100a91
child 588988 d6e2bf1d80b0de62e93d3206fbfe048e1ed4caab
push id148060
push usernerli@mozilla.com
push dateFri, 13 Aug 2021 22:08:40 +0000
treeherderautoland@c77107cec728 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1708580
milestone93.0a1
backs out65f8b0434e1e99f0602628467977bebf979a15db
first release with
nightly linux32
df4b218d495a / 93.0a1 / 20210813215247 / files
nightly linux64
df4b218d495a / 93.0a1 / 20210813215247 / files
nightly mac
df4b218d495a / 93.0a1 / 20210813215247 / files
nightly win32
df4b218d495a / 93.0a1 / 20210813215247 / files
nightly win64
df4b218d495a / 93.0a1 / 20210813215247 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 65f8b0434e1e (bug 1708580) for causing Btime failures. CLOSED TREE
mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
toolkit/crashreporter/CrashAnnotations.yaml
widget/android/nsAppShell.cpp
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoThread.java
@@ -583,21 +583,16 @@ public class GeckoThread extends Thread 
      * @param maxState Upper range of allowable states
      * @return True if the current Gecko thread state matches
      */
     public static boolean isStateBetween(final State minState, final State maxState) {
         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);
     }
 
     @WrapForJNI(calledFrom = "gecko")
     private static boolean checkAndSetState(final State expectedState,
                                             final State newState) {
         final boolean result = sNativeQueue.checkAndSetState(expectedState, newState);
--- a/toolkit/crashreporter/CrashAnnotations.yaml
+++ b/toolkit/crashreporter/CrashAnnotations.yaml
@@ -293,21 +293,16 @@ ExpectedStreamLen:
   type: integer
 
 ExperimentalFeatures:
   description: >
     Comma-separated list of enabled experimental features from about:preferences#experimental.
   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
     creation of an IPC stream proxy.
   type: string
 
 GMPLibraryPath:
   description: >
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -536,27 +536,16 @@ nsAppShell::Observe(nsISupports* aSubjec
     // for this particular GeckoView.
     nsCOMPtr<dom::Document> doc = do_QueryInterface(aSubject);
     MOZ_ASSERT(doc);
     if (const RefPtr<nsWindow> window = nsWindow::From(doc->GetWindow())) {
       window->OnGeckoViewReady();
     }
   } 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()
                                       : java::GeckoThread::State::EXITING());
     }
     removeObserver = true;
 
   } else if (!strcmp(aTopic, "quit-application-granted")) {