COMMIT_MESSAGE

Unreviewed, reverting 278130@main. 

https://bugs.webkit.org/show_bug.cgi?id=273491

SP3 1% regression

Reverted changeset:

"Decoupling from-font resolution from FontCascadeFonts::primaryFont"

https://bugs.webkit.org/show_bug.cgi?id=273339

https://commits.webkit.org/278130@main

Source/WebCore/css/ComputedStyleExtractor.cpp

@@static Ref<CSSValue> fontSizeAdjustFromStyle(const RenderStyle& style)

        return CSSPrimitiveValue::create(CSSValueNone);

    auto metric = fontSizeAdjust.metric;

373 fontSizeAdjust.resolveFromFontIfNeeded(style.computedFontSize(), style.metricsOfPrimaryFont());

374 auto value = fontSizeAdjust.value.asOptional();

373 auto value = fontSizeAdjust.isFromFont() ? fontSizeAdjust.resolve(style.computedFontSize(), style.metricsOfPrimaryFont()) : fontSizeAdjust.value.asOptional();

    if (metric == FontSizeAdjust::Metric::ExHeight)

        return CSSPrimitiveValue::create(*value);

Source/WebCore/platform/graphics/FontCascade.h

@@private:

inline const Font& FontCascade::primaryFont() const

{

    ASSERT(m_fonts);

    auto& font = protectedFonts()->primaryFont(m_fontDescription);

    m_fontDescription.resolveFontSizeAdjustFromFontIfNeeded(font);

    return font;

376 return protectedFonts()->primaryFont(m_fontDescription);

}

inline const FontRanges& FontCascade::fallbackRangesAt(unsigned index) const

Source/WebCore/platform/graphics/FontCascadeDescription.cpp

@@FontSmoothingMode FontCascadeDescription::usedFontSmoothing() const

    return fontSmoothingMode;

}

void FontCascadeDescription::resolveFontSizeAdjustFromFontIfNeeded(const Font& font)

{

    auto fontSizeAdjust = this->fontSizeAdjust();

    if (fontSizeAdjust.resolveFromFontIfNeeded(computedSize(), font.fontMetrics()))

        setFontSizeAdjust(fontSizeAdjust);

}

157150} // namespace WebCore

Source/WebCore/platform/graphics/FontCascadeDescription.h

@@typedef FontFamilySpecificationNull FontFamilyPlatformSpecification;

typedef std::variant<AtomString, FontFamilyPlatformSpecification> FontFamilySpecification;

48 class Font;

49

class FontCascadeDescription : public FontDescription {

public:

    WEBCORE_EXPORT FontCascadeDescription();

@@public:

    }

#endif

123 WEBCORE_EXPORT void resolveFontSizeAdjustFromFontIfNeeded(const Font&);

124

    // Initial values for font properties.

    static std::optional<FontSelectionValue> initialItalic() { return std::nullopt; }

    static FontStyleAxis initialFontStyleAxis() { return FontStyleAxis::slnt; }

Source/WebCore/platform/graphics/FontCascadeFonts.h

@@public:

    WidthCache& widthCache() { return m_widthCache; }

    const WidthCache& widthCache() const { return m_widthCache; }

77 const Font& primaryFont(~~const~~ FontCascadeDescription&);

77 const Font& primaryFont(FontCascadeDescription&);

    WEBCORE_EXPORT const FontRanges& realizeFallbackRangesAt(const FontCascadeDescription&, unsigned fallbackIndex);

    void pruneSystemFallbacks();

@@inline bool FontCascadeFonts::canTakeFixedPitchFastContentMeasuring(const FontCa

    return m_canTakeFixedPitchFastContentMeasuring == TriState::True;

}

147 inline const Font& FontCascadeFonts::primaryFont(~~const~~ FontCascadeDescription& description)

147inline const Font& FontCascadeFonts::primaryFont(FontCascadeDescription& description)

{

    ASSERT(m_thread ? m_thread->ptr() == &Thread::current() : isMainThread());

    if (!m_cachedPrimaryFont) {

@@inline const Font& FontCascadeFonts::primaryFont(const FontCascadeDescription& d

        ASSERT(m_cachedPrimaryFont);

        auto fontSizeAdjust = description.fontSizeAdjust();

        if (fontSizeAdjust.isFromFont()) {

            auto aspectValue = fontSizeAdjust.resolve(description.computedSize(), m_cachedPrimaryFont->fontMetrics());

            description.setFontSizeAdjust({ fontSizeAdjust.metric, FontSizeAdjust::ValueType::FromFont, aspectValue });

        }

167174 }

168 ASSERT(m_cachedPrimaryFont);

    return *m_cachedPrimaryFont;

}

Source/WebCore/platform/graphics/FontSizeAdjust.h

@@struct FontSizeAdjust {

            : std::nullopt;

    }

    bool resolveFromFontIfNeeded(float computedSize, const FontMetrics& fontMetrics)

    {

        if (!shouldResolveFromFont())

            return false;

        value = resolve(computedSize, fontMetrics);

        return true;

    }

8072 bool isNone() const { return !value && type != ValueType::FromFont; }

8173 bool isFromFont() const { return type == ValueType::FromFont; }

82 bool shouldResolveFromFont() const { return isFromFont() && !value; }

    Metric metric { Metric::ExHeight };

    ValueType type { ValueType::Number };