From 20d42c7e16d0f0544fad992f9639d07f91041c7a Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Mon, 15 May 2017 22:18:49 +1000
Subject: [PATCH] Bug 1328319 part 9 - Don't clean up retired counter styles
 for stylo. r=heycam

MozReview-Commit-ID: JWBhNvtYGIB

--HG--
extra : rebase_source : be7b1ad3221df48310d18c64e3aaf76e73309f72
---
 layout/base/nsPresContext.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 71a1c73c7476..85f10eb894ce 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -2311,8 +2311,14 @@ nsPresContext::FlushCounterStyles()
       PresShell()->NotifyCounterStylesAreDirty();
       PostRebuildAllStyleDataEvent(NS_STYLE_HINT_REFLOW,
                                    eRestyle_ForceDescendants);
-      RefreshDriver()->AddPostRefreshObserver(
-        new CounterStyleCleaner(RefreshDriver(), mCounterStyleManager));
+      if (mShell->StyleSet()->IsGecko()) {
+        RefreshDriver()->AddPostRefreshObserver(
+          new CounterStyleCleaner(RefreshDriver(), mCounterStyleManager));
+      } else {
+        NS_WARNING("stylo: Pseudo-element ::-moz-list-{number,bullet} are not "
+                   "restyled properly, so we cannot clean up retired objects. "
+                   "See bug 1364871.");
+      }
     }
     mCounterStylesDirty = false;
   }