From ed1f2eae501196fa517a0446cc3f66dc50669bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 9 Nov 2020 07:51:42 +0000
Subject: [PATCH] Bug 1675853 - FontFace.load() doesn't need to flush the user
 fontset. r=heycam

This one is even more subtle. This could cause a call from SetStatus()
to OnFontFaceStatusChange() to not be done as part of the load()
function (if the face is about to get added to the set or such).

However, when it's actually added via UpdateRules, we'd properly
invalidate the relevant state as well, so I think this is also fine, and
our existing tests also agree.

Depends on D96342

Differential Revision: https://phabricator.services.mozilla.com/D96343
---
 layout/style/FontFace.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/layout/style/FontFace.cpp b/layout/style/FontFace.cpp
index 557b85189369..76a72c89d457 100644
--- a/layout/style/FontFace.cpp
+++ b/layout/style/FontFace.cpp
@@ -328,8 +328,6 @@ FontFaceLoadStatus FontFace::Status() { return mStatus; }
 Promise* FontFace::Load(ErrorResult& aRv) {
   MOZ_ASSERT(NS_IsMainThread());
 
-  mFontFaceSet->FlushUserFontSet();
-
   EnsurePromise();
 
   if (!mLoaded) {