mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-07-04 16:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Make media type and feature evaluation combination explicit

Browse source 
Functionally this is the same before, as result is always True or False
before this point, and `True && Foo` evaluates to `Foo`. But this is
more clearly correct, instead of correct by coincidence.
This commit is contained in:
Sam Atkins 2025-05-22 11:37:59 +01:00
parent a4d3c62524
commit b577302f07
Notes: github-actions[bot] 2025-05-23 09:19:31 +00:00
2 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Libraries/LibWeb/CSS/BooleanExpression.h
View file

@ -14,18 +14,42 @@
namespace Web::CSS {
// Corresponds to Kleene 3-valued logic.
enum class MatchResult {
enum class MatchResult : u8 {
False,
True,
Unknown,
};
inline MatchResult as_match_result(bool value)
constexpr MatchResult operator&&(MatchResult const a, MatchResult const b)
{
// If either is false, false.
if (a == MatchResult::False || b == MatchResult::False)
return MatchResult::False;
// If both are true, true.
if (a == MatchResult::True && b == MatchResult::True)
return MatchResult::True;
// Otherwise, unknown.
return MatchResult::Unknown;
}
constexpr MatchResult operator||(MatchResult const a, MatchResult const b)
{
// If either is true, true.
if (a == MatchResult::True || b == MatchResult::True)
return MatchResult::True;
// If both are false, false.
if (a == MatchResult::False && b == MatchResult::False)
return MatchResult::False;
// Otherwise, unknown.
return MatchResult::Unknown;
}
constexpr MatchResult as_match_result(bool value)
{
return value ? MatchResult::True : MatchResult::False;
}
inline MatchResult negate(MatchResult value)
constexpr MatchResult negate(MatchResult value)
{
switch (value) {
case MatchResult::False:
@ -38,6 +62,19 @@ inline MatchResult negate(MatchResult value)
VERIFY_NOT_REACHED();
}
constexpr StringView to_string(MatchResult result)
{
switch (result) {
case MatchResult::False:
return "false"sv;
case MatchResult::True:
return "true"sv;
case MatchResult::Unknown:
return "unknown"sv;
}
VERIFY_NOT_REACHED();
}
// The contents of this file implement the `<boolean-expr>` concept.
// https://drafts.csswg.org/css-values-5/#typedef-boolean-expr
class BooleanExpression {

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

@ -305,8 +305,8 @@ bool MediaQuery::evaluate(HTML::Window const& window)
MatchResult result = matches_media(m_media_type);
if ((result == MatchResult::True) && m_media_condition)
result = m_media_condition->evaluate(&window);
if ((result != MatchResult::False) && m_media_condition)
result = result && m_media_condition->evaluate(&window);
if (m_negated)
result = negate(result);