mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-06 16:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Merge MediaFeature data members

Browse source 
A MediaFeature either has a MediaFeatureValue, or a Range, or nothing.
Combining these into a Variant reduces the size from 176 bytes to 128,
and also makes constructing these a little less awkward.
This commit is contained in:
Sam Atkins 2025-03-14 10:44:22 +00:00
commit e125ab360e
Notes: github-actions[bot] 2025-03-17 10:01:36 +00:00
2 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Libraries/LibWeb/CSS/MediaQuery.cpp
View file

@ -68,16 +68,18 @@ String MediaFeature::to_string() const
case Type::IsTrue:
return MUST(String::from_utf8(string_from_media_feature_id(m_id)));
case Type::ExactValue:
return MUST(String::formatted("{}: {}", string_from_media_feature_id(m_id), m_value->to_string()));
return MUST(String::formatted("{}: {}", string_from_media_feature_id(m_id), value().to_string()));
case Type::MinValue:
return MUST(String::formatted("min-{}: {}", string_from_media_feature_id(m_id), m_value->to_string()));
return MUST(String::formatted("min-{}: {}", string_from_media_feature_id(m_id), value().to_string()));
case Type::MaxValue:
return MUST(String::formatted("max-{}: {}", string_from_media_feature_id(m_id), m_value->to_string()));
case Type::Range:
if (!m_range->right_comparison.has_value())
return MUST(String::formatted("{} {} {}", m_range->left_value.to_string(), comparison_string(m_range->left_comparison), string_from_media_feature_id(m_id)));
return MUST(String::formatted("max-{}: {}", string_from_media_feature_id(m_id), value().to_string()));
case Type::Range: {
auto& range = this->range();
if (!range.right_comparison.has_value())
return MUST(String::formatted("{} {} {}", range.left_value.to_string(), comparison_string(range.left_comparison), string_from_media_feature_id(m_id)));
return MUST(String::formatted("{} {} {} {} {}", m_range->left_value.to_string(), comparison_string(m_range->left_comparison), string_from_media_feature_id(m_id), comparison_string(*m_range->right_comparison), m_range->right_value->to_string()));
return MUST(String::formatted("{} {} {} {} {}", range.left_value.to_string(), comparison_string(range.left_comparison), string_from_media_feature_id(m_id), comparison_string(*range.right_comparison), range.right_value->to_string()));
}
}
VERIFY_NOT_REACHED();
@ -118,24 +120,26 @@ MatchResult MediaFeature::evaluate(HTML::Window const* window) const
return MatchResult::False;
case Type::ExactValue:
return as_match_result(compare(*window, *m_value, Comparison::Equal, queried_value));
return as_match_result(compare(*window, value(), Comparison::Equal, queried_value));
case Type::MinValue:
return as_match_result(compare(*window, queried_value, Comparison::GreaterThanOrEqual, *m_value));
return as_match_result(compare(*window, queried_value, Comparison::GreaterThanOrEqual, value()));
case Type::MaxValue:
return as_match_result(compare(*window, queried_value, Comparison::LessThanOrEqual, *m_value));
return as_match_result(compare(*window, queried_value, Comparison::LessThanOrEqual, value()));
case Type::Range:
if (!compare(*window, m_range->left_value, m_range->left_comparison, queried_value))
case Type::Range: {
auto& range = this->range();
if (!compare(*window, range.left_value, range.left_comparison, queried_value))
return MatchResult::False;
if (m_range->right_comparison.has_value())
if (!compare(*window, queried_value, *m_range->right_comparison, *m_range->right_value))
if (range.right_comparison.has_value())
if (!compare(*window, queried_value, *range.right_comparison, *range.right_value))
return MatchResult::False;
return MatchResult::True;
}
}
VERIFY_NOT_REACHED();
}