RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:27:45 +00:00
Code Issues Activity Actions

LibWeb: Port FontFace to new Strings

Browse source
This commit is contained in:
Sam Atkins 2023-02-18 15:13:29 +00:00 • committed by Linus Groh
parent 33e9c4e1b2
commit c2f0b20d6b
5 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -1532,9 +1532,11 @@ void StyleComputer::load_fonts_from_sheet(CSSStyleSheet const& sheet)
if (!is<CSSFontFaceRule>(rule))
continue;
auto const& font_face = static_cast<CSSFontFaceRule const&>(rule).font_face();
// FIXME: Use font_face.font_family() directly when we port to new Strings here.
auto font_family = font_face.font_family().to_string().to_deprecated_string();
if (font_face.sources().is_empty())
continue;
if (m_loaded_fonts.contains(font_face.font_family()))
if (m_loaded_fonts.contains(font_family))
continue;
// NOTE: This is rather ad-hoc, we just look for the first valid
@ -1562,8 +1564,8 @@ void StyleComputer::load_fonts_from_sheet(CSSStyleSheet const& sheet)
LoadRequest request;
auto url = m_document.parse_url(candidate_url.value().to_deprecated_string());
auto loader = make<FontLoader>(const_cast<StyleComputer&>(*this), font_face.font_family(), move(url));
const_cast<StyleComputer&>(*this).m_loaded_fonts.set(font_face.font_family(), move(loader));
auto loader = make<FontLoader>(const_cast<StyleComputer&>(*this), font_family, move(url));
const_cast<StyleComputer&>(*this).m_loaded_fonts.set(font_family, move(loader));
}
}