From f3bcaf9f88aad2c423ebcd61121562f9834187d4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Apr 2024 17:11:27 +0200 Subject: Merging upstream version 115.8.0esr. Signed-off-by: Daniel Baumann --- dom/ipc/ContentParent.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'dom/ipc/ContentParent.h') diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index b4c1f45b35..e55fd9cef6 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -1171,17 +1171,19 @@ class ContentParent final : public PContentParent, const uint32_t& aFamilyIndex, const bool& aLoadCmaps); - mozilla::ipc::IPCResult RecvSetCharacterMap( - const uint32_t& aGeneration, const mozilla::fontlist::Pointer& aFacePtr, - const gfxSparseBitSet& aMap); + mozilla::ipc::IPCResult RecvSetCharacterMap(const uint32_t& aGeneration, + const uint32_t& aFamilyIndex, + const bool& aAlias, + const uint32_t& aFaceIndex, + const gfxSparseBitSet& aMap); mozilla::ipc::IPCResult RecvInitOtherFamilyNames(const uint32_t& aGeneration, const bool& aDefer, bool* aLoaded); - mozilla::ipc::IPCResult RecvSetupFamilyCharMap( - const uint32_t& aGeneration, - const mozilla::fontlist::Pointer& aFamilyPtr); + mozilla::ipc::IPCResult RecvSetupFamilyCharMap(const uint32_t& aGeneration, + const uint32_t& aIndex, + const bool& aAlias); mozilla::ipc::IPCResult RecvStartCmapLoading(const uint32_t& aGeneration, const uint32_t& aStartIndex); -- cgit v1.2.3