0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Add comparison operators to CSS numeric types (except Length)

Browse source 
This is to make it easier to bounds-check their values during parsing.
Length is left out because many length units are relative to the
context in which they are used, and so we cannot easily compare `10px`
and `1em`, for example.
This commit is contained in:
Sam Atkins 2023-05-31 14:55:18 +01:00 • committed by Andreas Kling
parent 06617a982e
commit fbfce2e73e
Notes: sideshowbarker 2024-07-17 07:14:09 +09:00
6 changed files with 69 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/CSS/Angle.h
View file

@ -38,6 +38,18 @@ public:
return m_type == other.m_type && m_value == other.m_value;
}
int operator<=>(Angle const& other) const
{
auto this_degrees = to_degrees();
auto other_degrees = other.to_degrees();
if (this_degrees < other_degrees)
return -1;
if (this_degrees > other_degrees)
return 1;
return 0;
}
private:
StringView unit_name() const;

12
Userland/Libraries/LibWeb/CSS/Frequency.h
View file

@ -35,6 +35,18 @@ public:
return m_type == other.m_type && m_value == other.m_value;
}
int operator<=>(Frequency const& other) const
{
auto this_hertz = to_hertz();
auto other_hertz = other.to_hertz();
if (this_hertz < other_hertz)
return -1;
if (this_hertz > other_hertz)
return 1;
return 0;
}
private:
StringView unit_name() const;

11
Userland/Libraries/LibWeb/CSS/Number.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -82,6 +82,15 @@ public:
return m_type == other.m_type && m_value == other.m_value;
}
int operator<=>(Number const& other) const
{
if (m_value < other.m_value)
return -1;
if (m_value > other.m_value)
return 1;
return 0;
}
private:
double m_value { 0 };
Type m_type;

11
Userland/Libraries/LibWeb/CSS/Percentage.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -38,6 +38,15 @@ public:
bool operator==(Percentage const& other) const { return m_value == other.m_value; }
int operator<=>(Percentage const& other) const
{
if (m_value < other.m_value)
return -1;
if (m_value > other.m_value)
return 1;
return 0;
}
private:
double m_value;
};

14
Userland/Libraries/LibWeb/CSS/Resolution.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -32,6 +32,18 @@ public:
return m_type == other.m_type && m_value == other.m_value;
}
int operator<=>(Resolution const& other) const
{
auto this_dots_per_pixel = to_dots_per_pixel();
auto other_dots_per_pixel = other.to_dots_per_pixel();
if (this_dots_per_pixel < other_dots_per_pixel)
return -1;
if (this_dots_per_pixel > other_dots_per_pixel)
return 1;
return 0;
}
private:
StringView unit_name() const;

12
Userland/Libraries/LibWeb/CSS/Time.h
View file

@ -37,6 +37,18 @@ public:
return m_type == other.m_type && m_value == other.m_value;
}
int operator<=>(Time const& other) const
{
auto this_seconds = to_seconds();
auto other_seconds = other.to_seconds();
if (this_seconds < other_seconds)
return -1;
if (this_seconds > other_seconds)
return 1;
return 0;
}
private:
StringView unit_name() const;