mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-30 04:39:06 +00:00
LibWeb/CSS: Merge RotationStyleValue into TransformationStyleValue
Same again, although rotation is more complicated: `rotate` is "equivalent to" multiple different transform function depending on its arguments. So we can parse as one of those instead of the full `rotate3d()`, but then need to handle this when serializing.
This commit is contained in:
Sam Atkins
Andreas Kling
parent
03a4ecce19
commit
b3b9eea986
Notes:
github-actions[bot]
2025-01-17 09:15:17 +00:00
Author: https://github.com/AtkinsSJ
Commit: b3b9eea986
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3263
12 changed files with 69 additions and 166 deletions
|
|
@ -1,49 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2024, Steffen T. Larssen <dudedbz@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/String.h>
|
||||
#include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
|
||||
#include <LibWeb/CSS/StyleValues/NumberStyleValue.h>
|
||||
|
||||
#include "RotationStyleValue.h"
|
||||
|
||||
namespace Web::CSS {
|
||||
|
||||
// https://www.w3.org/TR/2021/WD-css-transforms-2-20211109/#individual-transform-serialization
|
||||
String RotationStyleValue::to_string(SerializationMode mode) const
|
||||
{
|
||||
auto resolve_to_number = [](ValueComparingNonnullRefPtr<CSSStyleValue const> const& value) -> Optional<double> {
|
||||
if (value->is_number())
|
||||
return value->as_number().number();
|
||||
if (value->is_calculated() && value->as_calculated().resolves_to_number())
|
||||
return value->as_calculated().resolve_number();
|
||||
|
||||
VERIFY_NOT_REACHED();
|
||||
};
|
||||
|
||||
auto x_value = resolve_to_number(m_properties.rotation_x).value_or(0);
|
||||
auto y_value = resolve_to_number(m_properties.rotation_y).value_or(0);
|
||||
auto z_value = resolve_to_number(m_properties.rotation_z).value_or(0);
|
||||
|
||||
// If the axis is parallel with the x or y axes, it must serialize as the appropriate keyword.
|
||||
if (x_value > 0.0 && y_value == 0 && z_value == 0)
|
||||
return MUST(String::formatted("x {}", m_properties.angle->to_string(mode)));
|
||||
|
||||
if (x_value == 0 && y_value > 0.0 && z_value == 0)
|
||||
return MUST(String::formatted("y {}", m_properties.angle->to_string(mode)));
|
||||
|
||||
// If a rotation about the z axis (that is, in 2D) is specified, the property must serialize as just an <angle>.
|
||||
if (x_value == 0 && y_value == 0 && z_value > 0.0)
|
||||
return m_properties.angle->to_string(mode);
|
||||
|
||||
// It must serialize as the keyword none if and only if none was originally specified.
|
||||
// NOTE: This is handled by returning a keyword from the parser.
|
||||
|
||||
// If any other rotation is specified, the property must serialize with an axis specified.
|
||||
return MUST(String::formatted("{} {} {} {}", m_properties.rotation_x->to_string(mode), m_properties.rotation_y->to_string(mode), m_properties.rotation_z->to_string(mode), m_properties.angle->to_string(mode)));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2024, Steffen T. Larssen <dudedbz@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LibWeb/CSS/CSSStyleValue.h>
|
||||
|
||||
namespace Web::CSS {
|
||||
|
||||
class RotationStyleValue : public StyleValueWithDefaultOperators<RotationStyleValue> {
|
||||
public:
|
||||
static ValueComparingNonnullRefPtr<RotationStyleValue> create(ValueComparingNonnullRefPtr<CSSStyleValue const> angle, ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_x, ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_y, ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_z)
|
||||
{
|
||||
return adopt_ref(*new (nothrow) RotationStyleValue(move(angle), move(rotation_x), move(rotation_y), move(rotation_z)));
|
||||
}
|
||||
|
||||
virtual ~RotationStyleValue() override = default;
|
||||
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& angle() const { return m_properties.angle; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& rotation_x() const { return m_properties.rotation_x; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& rotation_y() const { return m_properties.rotation_y; }
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> const& rotation_z() const { return m_properties.rotation_z; }
|
||||
|
||||
virtual String to_string(SerializationMode) const override;
|
||||
|
||||
bool properties_equal(RotationStyleValue const& other) const { return m_properties == other.m_properties; }
|
||||
|
||||
private:
|
||||
explicit RotationStyleValue(
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> angle,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_x,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_y,
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_z)
|
||||
: StyleValueWithDefaultOperators(Type::Rotation)
|
||||
, m_properties {
|
||||
.angle = move(angle),
|
||||
.rotation_x = move(rotation_x),
|
||||
.rotation_y = move(rotation_y),
|
||||
.rotation_z = move(rotation_z)
|
||||
}
|
||||
{
|
||||
}
|
||||
|
||||
struct Properties {
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> angle;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_x;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_y;
|
||||
ValueComparingNonnullRefPtr<CSSStyleValue const> rotation_z;
|
||||
bool operator==(Properties const&) const = default;
|
||||
} m_properties;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
|
||||
* Copyright (c) 2021-2025, Sam Atkins <sam@ladybird.org>
|
||||
* Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
|
||||
* Copyright (c) 2024, Steffen T. Larssen <dudedbz@gmail.com>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
|
@ -64,6 +65,59 @@ Transformation TransformationStyleValue::to_transformation() const
|
|||
String TransformationStyleValue::to_string(SerializationMode mode) const
|
||||
{
|
||||
// https://drafts.csswg.org/css-transforms-2/#individual-transform-serialization
|
||||
if (m_properties.property == PropertyID::Rotate) {
|
||||
auto resolve_to_number = [](ValueComparingNonnullRefPtr<CSSStyleValue const> const& value) -> Optional<double> {
|
||||
if (value->is_number())
|
||||
return value->as_number().number();
|
||||
if (value->is_calculated() && value->as_calculated().resolves_to_number())
|
||||
return value->as_calculated().resolve_number();
|
||||
|
||||
VERIFY_NOT_REACHED();
|
||||
};
|
||||
|
||||
// NOTE: Serialize simple rotations directly.
|
||||
switch (m_properties.transform_function) {
|
||||
// If the axis is parallel with the x or y axes, it must serialize as the appropriate keyword.
|
||||
case TransformFunction::RotateX:
|
||||
return MUST(String::formatted("x {}", m_properties.values[0]->to_string(mode)));
|
||||
case TransformFunction::RotateY:
|
||||
return MUST(String::formatted("y {}", m_properties.values[0]->to_string(mode)));
|
||||
|
||||
// If a rotation about the z axis (that is, in 2D) is specified, the property must serialize as just an <angle>.
|
||||
case TransformFunction::Rotate:
|
||||
case TransformFunction::RotateZ:
|
||||
return m_properties.values[0]->to_string(mode);
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
auto& rotation_x = m_properties.values[0];
|
||||
auto& rotation_y = m_properties.values[1];
|
||||
auto& rotation_z = m_properties.values[2];
|
||||
auto& angle = m_properties.values[3];
|
||||
|
||||
auto x_value = resolve_to_number(rotation_x).value_or(0);
|
||||
auto y_value = resolve_to_number(rotation_y).value_or(0);
|
||||
auto z_value = resolve_to_number(rotation_z).value_or(0);
|
||||
|
||||
// If the axis is parallel with the x or y axes, it must serialize as the appropriate keyword.
|
||||
if (x_value > 0.0 && y_value == 0 && z_value == 0)
|
||||
return MUST(String::formatted("x {}", angle->to_string(mode)));
|
||||
|
||||
if (x_value == 0 && y_value > 0.0 && z_value == 0)
|
||||
return MUST(String::formatted("y {}", angle->to_string(mode)));
|
||||
|
||||
// If a rotation about the z axis (that is, in 2D) is specified, the property must serialize as just an <angle>.
|
||||
if (x_value == 0 && y_value == 0 && z_value > 0.0)
|
||||
return angle->to_string(mode);
|
||||
|
||||
// It must serialize as the keyword none if and only if none was originally specified.
|
||||
// NOTE: This is handled by returning a keyword from the parser.
|
||||
|
||||
// If any other rotation is specified, the property must serialize with an axis specified.
|
||||
return MUST(String::formatted("{} {} {} {}", rotation_x->to_string(mode), rotation_y->to_string(mode), rotation_z->to_string(mode), angle->to_string(mode)));
|
||||
}
|
||||
if (m_properties.property == PropertyID::Scale) {
|
||||
auto resolve_to_string = [mode](CSSStyleValue const& value) -> String {
|
||||
if (value.is_number()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue