Bug 1768096 - Correct the not-in-stylo-thread assertion in fontgroup destructor. r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D145902

gfx/thebes/gfxFont.cpp

@@ -12,7 +12,6 @@
 #include "mozilla/IntegerRange.h"
 #include "mozilla/intl/Segmenter.h"
 #include "mozilla/MathAlgorithms.h"
-#include "mozilla/ServoStyleSet.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/ScopeExit.h"
 #include "mozilla/SVGContextPaint.h"
@@ -109,7 +108,7 @@ NS_IMPL_ISUPPORTS(gfxFontCache::MemoryReporter, nsIMemoryReporter)
 /*virtual*/
 gfxTextRunFactory::~gfxTextRunFactory() {
   // Should not be dropped by stylo
-  MOZ_ASSERT(!ServoStyleSet::IsCurrentThreadInServoTraversal());
+  MOZ_ASSERT(!Servo_IsWorkerThread());
 }
 
 NS_IMETHODIMP

gfx/thebes/gfxTextRun.cpp

@@ -1899,7 +1899,7 @@ gfxFontGroup::gfxFontGroup(nsPresContext* aPresContext,
 
 gfxFontGroup::~gfxFontGroup() {
   // Should not be dropped by stylo
-  MOZ_ASSERT(!ServoStyleSet::IsCurrentThreadInServoTraversal());
+  MOZ_ASSERT(!Servo_IsWorkerThread());
 }
 
 static StyleGenericFontFamily GetDefaultGeneric(nsAtom* aLanguage) {