From e7ce51ebd97ae23c4274eb8350e1d9e11e04ef8d Mon Sep 17 00:00:00 2001
From: Coroiu Cristina <ccoroiu@mozilla.com>
Date: Wed, 17 Jul 2019 19:20:23 +0300
Subject: [PATCH] Backed out changeset 54e5c7e82504 (bug 1566684) for crashtest
 failures at dist/include/mozilla/dom/BindingUtils.h on a CLOSED TREE

---
 layout/style/CSSFontFaceRule.cpp        |  7 +++----
 layout/style/CSSPageRule.cpp            |  6 ++----
 layout/style/CSSStyleRule.cpp           |  6 ++----
 layout/style/crashtests/1566684.html    | 16 ----------------
 layout/style/crashtests/crashtests.list |  1 -
 5 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 layout/style/crashtests/1566684.html

diff --git a/layout/style/CSSFontFaceRule.cpp b/layout/style/CSSFontFaceRule.cpp
index 1d66a2a5bc18..9a5fb287ed50 100644
--- a/layout/style/CSSFontFaceRule.cpp
+++ b/layout/style/CSSFontFaceRule.cpp
@@ -150,16 +150,15 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(CSSFontFaceRule,
   tmp->mDecl.TraceWrapper(aCallbacks, aClosure);
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(CSSFontFaceRule)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CSSFontFaceRule,
+                                                mozilla::css::Rule)
   // Keep this in sync with IsCCLeaf.
 
   // Unlink the wrapper for our declaraton.  This just expands out
   // NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER which we can't use
   // directly because the wrapper is on the declaration, not on us.
-  //
-  // Note that this has to happen before unlinking css::Rule.
   tmp->mDecl.ReleaseWrapper(static_cast<nsISupports*>(p));
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED(mozilla::css::Rule)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CSSFontFaceRule,
                                                   mozilla::css::Rule)
diff --git a/layout/style/CSSPageRule.cpp b/layout/style/CSSPageRule.cpp
index dd9db4d762a8..f581ec40d472 100644
--- a/layout/style/CSSPageRule.cpp
+++ b/layout/style/CSSPageRule.cpp
@@ -103,17 +103,15 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(CSSPageRule, css::Rule)
   tmp->mDecls.TraceWrapper(aCallbacks, aClosure);
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(CSSPageRule)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CSSPageRule, css::Rule)
   // Keep this in sync with IsCCLeaf.
 
   // Unlink the wrapper for our declaraton.  This just expands out
   // NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER which we can't use
   // directly because the wrapper is on the declaration, not on us.
-  //
-  // Note that this has to happen before unlinking css::Rule.
   tmp->mDecls.ReleaseWrapper(static_cast<nsISupports*>(p));
   tmp->mDecls.mDecls->SetOwningRule(nullptr);
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED(css::Rule)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CSSPageRule, css::Rule)
   // Keep this in sync with IsCCLeaf.
diff --git a/layout/style/CSSStyleRule.cpp b/layout/style/CSSStyleRule.cpp
index e3db117bc50f..1c550674db0e 100644
--- a/layout/style/CSSStyleRule.cpp
+++ b/layout/style/CSSStyleRule.cpp
@@ -105,16 +105,14 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(CSSStyleRule, css::Rule)
   tmp->mDecls.TraceWrapper(aCallbacks, aClosure);
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(CSSStyleRule)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CSSStyleRule, css::Rule)
   // Keep this in sync with IsCCLeaf.
 
   // Unlink the wrapper for our declaraton.  This just expands out
   // NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER which we can't use
   // directly because the wrapper is on the declaration, not on us.
-  //
-  // Note that this has to happen before unlinking css::Rule.
   tmp->mDecls.ReleaseWrapper(static_cast<nsISupports*>(p));
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED(css::Rule)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CSSStyleRule, css::Rule)
   // Keep this in sync with IsCCLeaf.
diff --git a/layout/style/crashtests/1566684.html b/layout/style/crashtests/1566684.html
deleted file mode 100644
index 328ec46a6b75..000000000000
--- a/layout/style/crashtests/1566684.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<style>
-  x { }
-</style>
-<script>
-  var sheet = document.styleSheets[0];
-  var rule = sheet.cssRules[0];
-  var decl = rule.style;
-  rule.expando = 5;
-  decl.expando = 6;
-  sheet.deleteRule(0);
-  rule = decl = null;
-  SpecialPowers.forceGC();
-  SpecialPowers.forceCC();
-  SpecialPowers.forceGC();
-</script>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index eca63138fb06..276f0fcf5066 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -307,4 +307,3 @@ load 1545177.html
 skip-if(geckoview&&webrender) skip-if(Android&&!isDebugBuild) load 1546255.html # Bug 1563020 for GV+WR & Bug 1553971
 pref(layout.css.resizeobserver.enabled,true) load 1552911.html
 load 1562361.html
-load 1566684.html