diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /layout/style/FontFaceSetImpl.h | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'layout/style/FontFaceSetImpl.h')
| -rw-r--r-- | layout/style/FontFaceSetImpl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/layout/style/FontFaceSetImpl.h b/layout/style/FontFaceSetImpl.h index 6f245c6599..dd412dd721 100644 --- a/layout/style/FontFaceSetImpl.h +++ b/layout/style/FontFaceSetImpl.h @@ -92,9 +92,10 @@ class FontFaceSetImpl : public nsISupports, public gfxUserFontSet { virtual void DispatchToOwningThread(const char* aName, std::function<void()>&& aFunc) = 0; - // Called by nsFontFaceLoader when the loader has completed normally. + // Called by nsFontFaceLoader when the loader has completed normally, + // or by gfxUserFontSet if it cancels the loader. // It's removed from the mLoaders set. - virtual void RemoveLoader(nsFontFaceLoader* aLoader); + void RemoveLoader(nsFontFaceLoader* aLoader) override; virtual bool UpdateRules(const nsTArray<nsFontFaceRuleContainer>& aRules) { MOZ_ASSERT_UNREACHABLE("Not implemented!"); @@ -247,8 +248,6 @@ class FontFaceSetImpl : public nsISupports, public gfxUserFontSet { virtual TimeStamp GetNavigationStartTimeStamp() = 0; - mutable RecursiveMutex mMutex; - FontFaceSet* MOZ_NON_OWNING_REF mOwner MOZ_GUARDED_BY(mMutex); // The document's node principal, which is the principal font loads for |