REGRESSION(270320@main): Speedometer3/Editor-TipTap 4-6%

https://bugs.webkit.org/show_bug.cgi?id=264744 rdar://118312367 Unreviewed, partial revert of 270320@main to address the Speedometer regression. In 270320@main, I had converted all remaining CheckedPtr<Font> to WeakPtr<Font> to address crashes. However, we didn't need to convert GlyphData's font data member. Reverting this part of the change doesn't regress the layout test introduced in 270320@main but I have confirmed that it resolves the Speedometer regression. * Source/WebCore/platform/graphics/Font.h: * Source/WebCore/platform/graphics/FontCascade.cpp: (WebCore::FontCascade::emphasisMarkAscent const): (WebCore::FontCascade::emphasisMarkDescent const): (WebCore::FontCascade::drawEmphasisMarks const): * Source/WebCore/platform/graphics/FontCascadeFonts.cpp: (WebCore::MixedFontGlyphPage::setGlyphDataForIndex): * Source/WebCore/platform/graphics/GlyphPage.h: Canonical link: https://commits.webkit.org/270646@main
WebKit · Nov 13, 2023 · 7c1250d · 7c1250d
1 parent 91a7856
commit 7c1250d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Source/WebCore/platform/graphics/Font.h b/Source/WebCore/platform/graphics/Font.h
@@ -30,6 +30,7 @@
 #include "RenderingResourceIdentifier.h"
 #include <variant>
 #include <wtf/BitVector.h>
+#include <wtf/CheckedRef.h>
 #include <wtf/Hasher.h>
 #include <wtf/WeakPtr.h>
 #include <wtf/text/StringHash.h>
@@ -74,7 +75,7 @@ bool fontHasEitherTable(CTFontRef, unsigned tableTag1, unsigned tableTag2);
 #endif
 
 DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(Font);
-class Font : public RefCounted<Font>, public CanMakeWeakPtr<Font> {
+class Font : public RefCounted<Font>, public CanMakeWeakPtr<Font>, public CanMakeCheckedPtr {
     WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(Font);
 public:
     // Used to create platform fonts.

diff --git a/Source/WebCore/platform/graphics/FontCascade.cpp b/Source/WebCore/platform/graphics/FontCascade.cpp
@@ -1224,7 +1224,7 @@ int FontCascade::emphasisMarkAscent(const AtomString& mark) const
     if (!markGlyphData)
         return 0;
 
-    WeakPtr markFontData = markGlyphData.value().font;
+    CheckedPtr markFontData = markGlyphData.value().font;
     ASSERT(markFontData);
     if (!markFontData)
         return 0;
@@ -1238,7 +1238,7 @@ int FontCascade::emphasisMarkDescent(const AtomString& mark) const
     if (!markGlyphData)
         return 0;
 
-    WeakPtr markFontData = markGlyphData.value().font;
+    CheckedPtr markFontData = markGlyphData.value().font;
     ASSERT(markFontData);
     if (!markFontData)
         return 0;
@@ -1402,7 +1402,7 @@ void FontCascade::drawEmphasisMarks(GraphicsContext& context, const GlyphBuffer&
     if (!markGlyphData)
         return;
 
-    WeakPtr markFontData = markGlyphData.value().font;
+    CheckedPtr markFontData = markGlyphData.value().font;
     ASSERT(markFontData);
     if (!markFontData)
         return;

diff --git a/Source/WebCore/platform/graphics/FontCascadeFonts.cpp b/Source/WebCore/platform/graphics/FontCascadeFonts.cpp
@@ -63,7 +63,7 @@ class MixedFontGlyphPage {
     {
         ASSERT_WITH_SECURITY_IMPLICATION(index < GlyphPage::size);
         m_glyphs[index] = glyphData.glyph;
-        m_fonts[index] = glyphData.font;
+        m_fonts[index] = glyphData.font.get();
     }
 
     Glyph m_glyphs[GlyphPage::size] { };

diff --git a/Source/WebCore/platform/graphics/GlyphPage.h b/Source/WebCore/platform/graphics/GlyphPage.h
@@ -55,7 +55,7 @@ struct GlyphData {
 
     Glyph glyph;
     ColorGlyphType colorGlyphType;
-    WeakPtr<const Font> font;
+    CheckedPtr<const Font> font;
 };
 
 // A GlyphPage contains a fixed-size set of GlyphData mappings for a contiguous

diff --git a/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp b/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
@@ -123,14 +123,14 @@ const Font* FontCascade::fontForCombiningCharacterSequence(StringView stringView
     else if (characters[length - 1] == 0xFE0F)
         preferColoredFont = true;
 
-    WeakPtr baseFont = glyphDataForCharacter(character, false, NormalVariant).font;
+    CheckedPtr baseFont = glyphDataForCharacter(character, false, NormalVariant).font;
     if (baseFont
         && (clusterLength == length || baseFont->canRenderCombiningCharacterSequence(normalizedString.view))
         && (!preferColoredFont || baseFont->platformData().isColorBitmapFont()))
         return baseFont.get();
 
     for (unsigned i = 0; !fallbackRangesAt(i).isNull(); ++i) {
-        WeakPtr fallbackFont = fallbackRangesAt(i).fontForCharacter(character);
+        CheckedPtr fallbackFont = fallbackRangesAt(i).fontForCharacter(character);
         if (!fallbackFont || fallbackFont == baseFont)
             continue;