Font: Cache HarfBuzz fonts and font details

Author: Anthony-Nicholls

modules/juce_graphics/detail/juce_SimpleShapedText.cpp

@@ -219,7 +219,7 @@ static std::vector<ShapedGlyph> lowLevelShape (Span<const juce_wchar> string,
 {
     static const auto language = SystemStats::getDisplayLanguage();
 
-    HbBuffer buffer { hb_buffer_create() };
+    HbBuffer buffer { hb_buffer_create(), IncrementRef::no };
     hb_buffer_clear_contents (buffer.get());
 
     hb_buffer_set_cluster_level (buffer.get(), HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
@@ -316,20 +316,14 @@ static std::vector<ShapedGlyph> lowLevelShape (Span<const juce_wchar> string,
         const auto xAdvanceBase = HbScale::hbToJuce (positions[visualIndex].x_advance);
         const auto yAdvanceBase = -HbScale::hbToJuce (positions[visualIndex].y_advance);
 
-        // For certain OS, Font and glyph ID combinations harfbuzz will not find extents data and
-        // hb_font_get_glyph_extents will return false. In such cases Typeface::getGlyphBounds
-        // will return an empty rectangle. Here we need to distinguish this situation from the one
-        // where extents information is available and is an empty rectangle, which indicates a
-        // whitespace.
-        const auto extentsDataAvailable = std::invoke ([&]
-        {
-            hb_glyph_extents_t extents{};
-            return hb_font_get_glyph_extents (font.getTypefacePtr()->getNativeDetails().getFont(),
-                                              (hb_codepoint_t) glyphId,
-                                              &extents);
-        });
+        // For certain OS, Font and glyph ID combinations harfbuzz will not find extents data.
+        // In such cases Typeface::getGlyphBounds will return an empty rectangle. Here we need
+        // to distinguish this situation from the one where extents information is available
+        // and is an empty rectangle, which indicates a whitespace.
+        const auto* native = font.getTypefacePtr()->getNativeDetails();
+        const auto extents = native->getGlyphExtents (glyphId);
 
-        const auto whitespace = extentsDataAvailable
+        const auto whitespace = extents.has_value()
                                 && font.getTypefacePtr()->getGlyphBounds (font.getMetricsKind(), (int) glyphId).isEmpty()
                                 && xAdvanceBase > 0;
 

modules/juce_graphics/fonts/juce_Font.cpp

@@ -220,7 +220,7 @@ class Font::SharedFontInternal  : public ReferenceCountedObject
         const ScopedLock lock (mutex);
 
         if (auto ptr = getTypefacePtr (f))
-            return ptr->getNativeDetails().getFontAtPointSizeAndScale (f.getHeightInPoints(), f.getHorizontalScale());
+            return ptr->getNativeDetails()->getFontAtPointSizeAndScale (f.getHeightInPoints(), f.getHorizontalScale());
 
         return {};
     }
@@ -231,7 +231,7 @@ class Font::SharedFontInternal  : public ReferenceCountedObject
 
         if (auto ptr = getTypefacePtr (f))
         {
-            const auto ascentDescent = ptr->getNativeDetails().getAscentDescent (f.getMetricsKind());
+            const auto ascentDescent = ptr->getNativeDetails()->getAscentDescent (f.getMetricsKind());
 
             auto adjusted = ascentDescent;
             adjusted.ascent = getAscentOverride().value_or (adjusted.ascent);
@@ -886,7 +886,7 @@ static bool characterNotRendered (uint32_t c)
 
 static bool isFontSuitableForCodepoint (const Font& font, juce_wchar c)
 {
-    const auto& hbFont = font.getNativeDetails().font;
+    const auto hbFont = font.getNativeDetails().font;
 
     if (hbFont == nullptr)
         return false;
@@ -994,7 +994,7 @@ Font::Native Font::getNativeDetails() const
 
 Typeface::Ptr Font::getDefaultTypefaceForFont (const Font& font)
 {
-    const auto resolvedTypeface = [&]() -> Typeface::Ptr
+    const auto resolvedTypeface = std::invoke ([&]() -> Typeface::Ptr
     {
         if (font.getTypefaceName() != getSystemUIFontName())
             return {};
@@ -1010,7 +1010,7 @@ Typeface::Ptr Font::getDefaultTypefaceForFont (const Font& font)
         auto copy = font;
         copy.setTypefaceName (systemTypeface->getName());
         return getDefaultTypefaceForFont (copy);
-    }();
+    });
 
     if (resolvedTypeface != nullptr)
         return resolvedTypeface;