mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-04-20 11:36:10 +00:00
LibWeb/CSS: Support creating ParsedFontFace from CSSFontFaceDescriptors
This commit is contained in:
Sam Atkins
parent
cb8511772d
commit
3c9685ff1a
Notes:
github-actions[bot]
2025-04-04 09:41:46 +00:00
Author: https://github.com/AtkinsSJ Commit: https://github.com/LadybirdBrowser/ladybird/commit/3c9685ff1a6 Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/4206
2 changed files with 178 additions and 2 deletions
|
|
@ -1,14 +1,188 @@
|
|||
/*
|
||||
* Copyright (c) 2022-2024, Sam Atkins <sam@ladybird.org>
|
||||
* Copyright (c) 2022-2025, Sam Atkins <sam@ladybird.org>
|
||||
* Copyright (c) 2023, Andreas Kling <andreas@ladybird.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibWeb/CSS/CSSFontFaceDescriptors.h>
|
||||
#include <LibWeb/CSS/ParsedFontFace.h>
|
||||
#include <LibWeb/CSS/StyleValues/CSSKeywordValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/CustomIdentStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/FontSourceStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/IntegerStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/NumberStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/OpenTypeTaggedStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/StyleValueList.h>
|
||||
#include <LibWeb/CSS/StyleValues/UnicodeRangeStyleValue.h>
|
||||
|
||||
namespace Web::CSS {
|
||||
|
||||
ParsedFontFace ParsedFontFace::from_descriptors(CSSFontFaceDescriptors const& descriptors)
|
||||
{
|
||||
auto extract_font_name = [](CSSStyleValue const& value) {
|
||||
if (value.is_string())
|
||||
return value.as_string().string_value();
|
||||
if (value.is_custom_ident())
|
||||
return value.as_custom_ident().custom_ident();
|
||||
return FlyString {};
|
||||
};
|
||||
|
||||
auto extract_percentage_or_normal = [](CSSStyleValue const& value) -> Optional<Percentage> {
|
||||
if (value.is_percentage())
|
||||
return value.as_percentage().percentage();
|
||||
if (value.is_calculated()) {
|
||||
// FIXME: These should probably be simplified already?
|
||||
return value.as_calculated().resolve_percentage({});
|
||||
}
|
||||
if (value.to_keyword() == Keyword::Normal)
|
||||
return {};
|
||||
|
||||
return {};
|
||||
};
|
||||
|
||||
FlyString font_family;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontFamily))
|
||||
font_family = extract_font_name(*value);
|
||||
|
||||
Optional<int> weight;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontWeight))
|
||||
weight = value->to_font_weight();
|
||||
|
||||
Optional<int> slope;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontStyle))
|
||||
slope = value->to_font_slope();
|
||||
|
||||
Optional<int> width;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontWidth))
|
||||
width = value->to_font_width();
|
||||
|
||||
Vector<Source> sources;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::Src)) {
|
||||
auto add_source = [&sources, extract_font_name](FontSourceStyleValue const& font_source) {
|
||||
font_source.source().visit(
|
||||
[&](FontSourceStyleValue::Local const& local) {
|
||||
sources.empend(extract_font_name(local.name), OptionalNone {});
|
||||
},
|
||||
[&](URL::URL const& url) {
|
||||
// FIXME: tech()
|
||||
sources.empend(url, font_source.format());
|
||||
});
|
||||
};
|
||||
|
||||
if (value->is_font_source()) {
|
||||
add_source(value->as_font_source());
|
||||
} else if (value->is_value_list()) {
|
||||
for (auto const& source : value->as_value_list().values())
|
||||
add_source(source->as_font_source());
|
||||
}
|
||||
}
|
||||
|
||||
Vector<Gfx::UnicodeRange> unicode_ranges;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::UnicodeRange)) {
|
||||
if (value->is_unicode_range()) {
|
||||
unicode_ranges.append(value->as_unicode_range().unicode_range());
|
||||
} else if (value->is_value_list()) {
|
||||
for (auto const& range : value->as_value_list().values())
|
||||
unicode_ranges.append(range->as_unicode_range().unicode_range());
|
||||
}
|
||||
}
|
||||
if (unicode_ranges.is_empty())
|
||||
unicode_ranges.empend(0x0u, 0x10FFFFu);
|
||||
|
||||
Optional<Percentage> ascent_override;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::AscentOverride))
|
||||
ascent_override = extract_percentage_or_normal(*value);
|
||||
|
||||
Optional<Percentage> descent_override;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::DescentOverride))
|
||||
descent_override = extract_percentage_or_normal(*value);
|
||||
|
||||
Optional<Percentage> line_gap_override;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::LineGapOverride))
|
||||
line_gap_override = extract_percentage_or_normal(*value);
|
||||
|
||||
FontDisplay font_display;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontDisplay))
|
||||
font_display = keyword_to_font_display(value->to_keyword()).value_or(FontDisplay::Auto);
|
||||
|
||||
Optional<FlyString> font_named_instance;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontNamedInstance)) {
|
||||
if (value->is_string())
|
||||
font_named_instance = value->as_string().string_value();
|
||||
}
|
||||
|
||||
Optional<FlyString> font_language_override;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontLanguageOverride)) {
|
||||
if (value->is_string())
|
||||
font_language_override = value->as_string().string_value();
|
||||
}
|
||||
|
||||
Optional<OrderedHashMap<FlyString, i64>> font_feature_settings;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontFeatureSettings)) {
|
||||
if (value->to_keyword() == Keyword::Normal) {
|
||||
font_feature_settings.clear();
|
||||
} else if (value->is_value_list()) {
|
||||
auto const& feature_tags = value->as_value_list().values();
|
||||
OrderedHashMap<FlyString, i64> settings;
|
||||
settings.ensure_capacity(feature_tags.size());
|
||||
for (auto const& feature_tag : feature_tags) {
|
||||
auto const& setting_value = feature_tag->as_open_type_tagged().value();
|
||||
if (setting_value->is_integer()) {
|
||||
settings.set(feature_tag->as_open_type_tagged().tag(), setting_value->as_integer().integer());
|
||||
} else if (setting_value->is_calculated() && setting_value->as_calculated().resolves_to_number()) {
|
||||
if (auto integer = setting_value->as_calculated().resolve_integer({}); integer.has_value()) {
|
||||
settings.set(feature_tag->as_open_type_tagged().tag(), *integer);
|
||||
}
|
||||
}
|
||||
}
|
||||
font_feature_settings = move(settings);
|
||||
}
|
||||
}
|
||||
|
||||
Optional<OrderedHashMap<FlyString, double>> font_variation_settings;
|
||||
if (auto value = descriptors.descriptor(DescriptorID::FontVariationSettings)) {
|
||||
if (value->to_keyword() == Keyword::Normal) {
|
||||
font_variation_settings.clear();
|
||||
} else if (value->is_value_list()) {
|
||||
auto const& variation_tags = value->as_value_list().values();
|
||||
OrderedHashMap<FlyString, double> settings;
|
||||
settings.ensure_capacity(variation_tags.size());
|
||||
for (auto const& variation_tag : variation_tags) {
|
||||
auto const& setting_value = variation_tag->as_open_type_tagged().value();
|
||||
if (setting_value->is_number()) {
|
||||
settings.set(variation_tag->as_open_type_tagged().tag(), setting_value->as_number().number());
|
||||
} else if (setting_value->is_calculated() && setting_value->as_calculated().resolves_to_number()) {
|
||||
if (auto number = setting_value->as_calculated().resolve_number({}); number.has_value()) {
|
||||
settings.set(variation_tag->as_open_type_tagged().tag(), *number);
|
||||
}
|
||||
}
|
||||
}
|
||||
font_variation_settings = move(settings);
|
||||
}
|
||||
}
|
||||
|
||||
return ParsedFontFace {
|
||||
move(font_family),
|
||||
move(weight),
|
||||
move(slope),
|
||||
move(width),
|
||||
move(sources),
|
||||
move(unicode_ranges),
|
||||
move(ascent_override),
|
||||
move(descent_override),
|
||||
move(line_gap_override),
|
||||
move(font_display),
|
||||
move(font_named_instance),
|
||||
move(font_language_override),
|
||||
move(font_feature_settings),
|
||||
move(font_variation_settings)
|
||||
};
|
||||
}
|
||||
|
||||
ParsedFontFace::ParsedFontFace(FlyString font_family, Optional<int> weight, Optional<int> slope, Optional<int> width, Vector<Source> sources, Vector<Gfx::UnicodeRange> unicode_ranges, Optional<Percentage> ascent_override, Optional<Percentage> descent_override, Optional<Percentage> line_gap_override, FontDisplay font_display, Optional<FlyString> font_named_instance, Optional<FlyString> font_language_override, Optional<OrderedHashMap<FlyString, i64>> font_feature_settings, Optional<OrderedHashMap<FlyString, double>> font_variation_settings)
|
||||
: m_font_family(move(font_family))
|
||||
, m_font_named_instance(move(font_named_instance))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2022-2024, Sam Atkins <sam@ladybird.org>
|
||||
* Copyright (c) 2022-2025, Sam Atkins <sam@ladybird.org>
|
||||
* Copyright (c) 2023, Andreas Kling <andreas@ladybird.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
|
|
@ -24,6 +24,8 @@ public:
|
|||
Optional<FlyString> format;
|
||||
};
|
||||
|
||||
static ParsedFontFace from_descriptors(CSSFontFaceDescriptors const&);
|
||||
|
||||
ParsedFontFace(FlyString font_family, Optional<int> weight, Optional<int> slope, Optional<int> width, Vector<Source> sources, Vector<Gfx::UnicodeRange> unicode_ranges, Optional<Percentage> ascent_override, Optional<Percentage> descent_override, Optional<Percentage> line_gap_override, FontDisplay font_display, Optional<FlyString> font_named_instance, Optional<FlyString> font_language_override, Optional<OrderedHashMap<FlyString, i64>> font_feature_settings, Optional<OrderedHashMap<FlyString, double>> font_variation_settings);
|
||||
~ParsedFontFace() = default;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue