diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2023-03-30 15:55:02 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2023-03-30 21:29:50 +0200 |
commit | ac4350748eb05cd11dffc090a752bfc702366567 (patch) | |
tree | 43023962e5c98ae64253e9665633810264462038 /Userland/Libraries | |
parent | bf915fdfd7716ea0882ff4b0b9d5a9913950f7a4 (diff) | |
download | serenity-ac4350748eb05cd11dffc090a752bfc702366567.zip |
LibWeb: Remove CalculatedStyleValue from Time
Time also isn't used anywhere yet, hooray!
Diffstat (limited to 'Userland/Libraries')
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Time.cpp | 25 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Time.h | 11 |
2 files changed, 3 insertions, 33 deletions
diff --git a/Userland/Libraries/LibWeb/CSS/Time.cpp b/Userland/Libraries/LibWeb/CSS/Time.cpp index d6eddaf5ec..76976b4280 100644 --- a/Userland/Libraries/LibWeb/CSS/Time.cpp +++ b/Userland/Libraries/LibWeb/CSS/Time.cpp @@ -1,11 +1,11 @@ /* - * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org> + * Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org> * * SPDX-License-Identifier: BSD-2-Clause */ #include "Time.h" -#include <LibWeb/CSS/StyleValue.h> +#include <LibWeb/CSS/Percentage.h> namespace Web::CSS { @@ -21,13 +21,6 @@ Time::Time(float value, Type type) { } -Time Time::make_calculated(NonnullRefPtr<CalculatedStyleValue> calculated_style_value) -{ - Time frequency { 0, Type::Calculated }; - frequency.m_calculated_style = move(calculated_style_value); - return frequency; -} - Time Time::make_seconds(float value) { return { value, Type::S }; @@ -35,23 +28,17 @@ Time Time::make_seconds(float value) Time Time::percentage_of(Percentage const& percentage) const { - VERIFY(!is_calculated()); - return Time { percentage.as_fraction() * m_value, m_type }; } ErrorOr<String> Time::to_string() const { - if (is_calculated()) - return m_calculated_style->to_string(); return String::formatted("{}{}", m_value, unit_name()); } float Time::to_seconds() const { switch (m_type) { - case Type::Calculated: - return m_calculated_style->resolve_time()->to_seconds(); case Type::S: return m_value; case Type::Ms: @@ -63,8 +50,6 @@ float Time::to_seconds() const StringView Time::unit_name() const { switch (m_type) { - case Type::Calculated: - return "calculated"sv; case Type::S: return "s"sv; case Type::Ms: @@ -83,10 +68,4 @@ Optional<Time::Type> Time::unit_from_name(StringView name) return {}; } -NonnullRefPtr<CalculatedStyleValue> Time::calculated_style_value() const -{ - VERIFY(!m_calculated_style.is_null()); - return *m_calculated_style; -} - } diff --git a/Userland/Libraries/LibWeb/CSS/Time.h b/Userland/Libraries/LibWeb/CSS/Time.h index ccc56eaacf..fc1768731b 100644 --- a/Userland/Libraries/LibWeb/CSS/Time.h +++ b/Userland/Libraries/LibWeb/CSS/Time.h @@ -1,12 +1,11 @@ /* - * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org> + * Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org> * * SPDX-License-Identifier: BSD-2-Clause */ #pragma once -#include <AK/RefPtr.h> #include <AK/String.h> #include <LibWeb/Forward.h> @@ -15,7 +14,6 @@ namespace Web::CSS { class Time { public: enum class Type { - Calculated, S, Ms, }; @@ -24,20 +22,14 @@ public: Time(int value, Type type); Time(float value, Type type); - static Time make_calculated(NonnullRefPtr<CalculatedStyleValue>); static Time make_seconds(float); Time percentage_of(Percentage const&) const; - bool is_calculated() const { return m_type == Type::Calculated; } - NonnullRefPtr<CalculatedStyleValue> calculated_style_value() const; - ErrorOr<String> to_string() const; float to_seconds() const; bool operator==(Time const& other) const { - if (is_calculated()) - return m_calculated_style == other.m_calculated_style; return m_type == other.m_type && m_value == other.m_value; } @@ -46,7 +38,6 @@ private: Type m_type; float m_value { 0 }; - RefPtr<CalculatedStyleValue> m_calculated_style; }; } |