Skip to content

Optimize GlyphTypeface: Avoid create the cmap Dictionary when get Count only #11139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Optimize GlyphTypeface: Avoid create the cmap Dictionary when get Count only #11139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/FontCache/FontFaceLayoutInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

//
Expand Down Expand Up @@ -733,7 +733,26 @@ public void CopyTo(KeyValuePair<int, ushort>[] array, int arrayIndex)

public int Count
{
get { return CMap.Count; }
get
{
if (_cmap == null)
{
// When _cmap is not created yet, we can get the count directly from the font. We don't use the CMap property, because that would create the cmap and initialize it slowly.
MS.Internal.Text.TextInterface.FontFace fontFace = _font.GetFontFace();
try
{
return fontFace.GlyphCount;
}
finally
{
fontFace.Release();
}
}
else
{
return _cmap.Count;
}
}
}

public bool IsReadOnly
Expand Down