From 99d2153aa938de3e79159ebc07741761d3a96891 Mon Sep 17 00:00:00 2001
From: Yura Zenevich <yura.zenevich@gmail.com>
Date: Tue, 24 Oct 2017 12:39:11 -0400
Subject: [PATCH] Bug 918246 - ensure accessibility service is shutdown after
 a11y crashtests. r=surkov

MozReview-Commit-ID: HjP6pVlGyl0
---
 accessible/tests/crashtests/471493.xul        | 26 ++++++++++++--
 accessible/tests/crashtests/crashtests.list   |  8 +++--
 .../last_test_to_unload_testsuite.xul         | 36 +++++++++++++++++++
 3 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 accessible/tests/crashtests/last_test_to_unload_testsuite.xul

diff --git a/accessible/tests/crashtests/471493.xul b/accessible/tests/crashtests/471493.xul
index 2524d47cc2bd..8e81aabee497 100644
--- a/accessible/tests/crashtests/471493.xul
+++ b/accessible/tests/crashtests/471493.xul
@@ -3,10 +3,27 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="bug 471493 'crash [@ nsPropertyTable::GetPropertyInternal]'"
-        onload="doTest();">
+        onload="doTest();" class="reftest-wait">
 
   <script type="application/javascript">
   <![CDATA[
+    function addA11yLoadEvent(accService, func) {
+      function waitForDocLoad() {
+        setTimeout(() => {
+            let accDoc = accService.getAccessibleFor(document);
+            let state = {};
+            accDoc.getState(state, {});
+
+            if (state.value & SpecialPowers.Ci.nsIAccessibleStates.STATE_BUSY) {
+              return waitForDocLoad();
+            }
+            setTimeout(func, 0);
+          }, 0);
+      }
+
+      waitForDocLoad();
+    }
+
     function doTest()
     {
       var accService = SpecialPowers.Cc["@mozilla.org/accessibilityService;1"].
@@ -17,8 +34,11 @@
       var y = treecol.boxObject.screenY;
 
       var tree = document.getElementById("tree");
-      var treeAcc = accService.getAccessibleFor(tree);
-      treeAcc.getChildAtPoint(x + 1, y + 1);
+      addA11yLoadEvent(accService, () => {
+        var treeAcc = accService.getAccessibleFor(tree);
+        treeAcc.getChildAtPoint(x + 1, y + 1);
+        document.documentElement.removeAttribute("class");
+      });
     }
   ]]>
   </script>
diff --git a/accessible/tests/crashtests/crashtests.list b/accessible/tests/crashtests/crashtests.list
index 6718706aaec2..47458f980110 100644
--- a/accessible/tests/crashtests/crashtests.list
+++ b/accessible/tests/crashtests/crashtests.list
@@ -1,3 +1,5 @@
-# Disabled because they cause assertions/crashes in later crashtests, see bug 918246
-skip load 448064.xhtml
-skip load 471493.xul
+load 448064.xhtml # This test instantiates a11y, so be careful about adding tests before it
+load 471493.xul
+# last_test_to_unload_testsuite.xul MUST be the last test in the list because it
+# is responsible for shutting down accessibility service affecting later tests.
+load last_test_to_unload_testsuite.xul
diff --git a/accessible/tests/crashtests/last_test_to_unload_testsuite.xul b/accessible/tests/crashtests/last_test_to_unload_testsuite.xul
new file mode 100644
index 000000000000..9a70c41dcfec
--- /dev/null
+++ b/accessible/tests/crashtests/last_test_to_unload_testsuite.xul
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="bug 471493 'crash [@ nsPropertyTable::GetPropertyInternal]'"
+        onload="shutdown();" class="reftest-wait">
+
+  <script type="application/javascript">
+  <![CDATA[
+    function shutdown() {
+      !SpecialPowers.Services.appinfo.accessibilityEnabled &&
+        dump("### Error : Accessibility is expected to be enabled.\n");
+
+      // Force garbage collection. We try really hard to garbage collect
+      // everythin here to ensure that all a11y xpcom bits are shut down and
+      // avoid intermittent timeouts.
+      SpecialPowers.gc();
+      SpecialPowers.forceShrinkingGC();
+      SpecialPowers.forceCC();
+      SpecialPowers.gc();
+      SpecialPowers.forceShrinkingGC();
+      SpecialPowers.forceCC();
+
+      if (SpecialPowers.Services.appinfo.accessibilityEnabled) {
+        let observe = (subject, topic, data) => {
+          SpecialPowers.Services.obs.removeObserver(observe, "a11y-init-or-shutdown");
+          data === "0" && document.documentElement.removeAttribute("class");
+        };
+        SpecialPowers.Services.obs.addObserver(observe, "a11y-init-or-shutdown");
+      } else {
+        document.documentElement.removeAttribute("class");
+      }
+    }
+  ]]>
+  </script>
+</window>