3af6a69f1e
Instead of CSSColorValue holding a Gfx::Color, make it an abstract class with subclasses for each different color function, to match the Typed-OM spec. This means moving the color calculations from the parsing code to the `to_color()` method on the style value. This lets us have calc() inside a color function, instead of having to fully resolve the color at parse time. The canvas fillStyle tests have been updated to reflect this. The other test change is Screenshot/css-color-functions.html: previously we produced slightly different colors for an alpha of 0.5 and one of 50%, and this incorrect behavior was baked into the test. So now it's more correct. :^)
54 lines
2 KiB
C++
54 lines
2 KiB
C++
/*
|
|
* Copyright (c) 2024, Sam Atkins <sam@ladybird.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <LibWeb/CSS/StyleValues/CSSColorValue.h>
|
|
#include <LibWeb/CSS/StyleValues/NumberStyleValue.h>
|
|
|
|
namespace Web::CSS {
|
|
|
|
// https://drafts.css-houdini.org/css-typed-om-1/#cssoklch
|
|
class CSSOKLCH final : public CSSColorValue {
|
|
public:
|
|
static ValueComparingNonnullRefPtr<CSSOKLCH> create(ValueComparingNonnullRefPtr<CSSStyleValue> l, ValueComparingNonnullRefPtr<CSSStyleValue> c, ValueComparingNonnullRefPtr<CSSStyleValue> h, ValueComparingRefPtr<CSSStyleValue> alpha = {})
|
|
{
|
|
// alpha defaults to 1
|
|
if (!alpha)
|
|
return adopt_ref(*new (nothrow) CSSOKLCH(move(l), move(c), move(h), NumberStyleValue::create(1)));
|
|
|
|
return adopt_ref(*new (nothrow) CSSOKLCH(move(l), move(c), move(h), alpha.release_nonnull()));
|
|
}
|
|
virtual ~CSSOKLCH() override = default;
|
|
|
|
CSSStyleValue const& l() const { return *m_properties.l; }
|
|
CSSStyleValue const& c() const { return *m_properties.c; }
|
|
CSSStyleValue const& h() const { return *m_properties.h; }
|
|
CSSStyleValue const& alpha() const { return *m_properties.alpha; }
|
|
|
|
virtual Color to_color(Optional<Layout::NodeWithStyle const&>) const override;
|
|
|
|
String to_string() const override;
|
|
|
|
virtual bool equals(CSSStyleValue const& other) const override;
|
|
|
|
private:
|
|
CSSOKLCH(ValueComparingNonnullRefPtr<CSSStyleValue> l, ValueComparingNonnullRefPtr<CSSStyleValue> c, ValueComparingNonnullRefPtr<CSSStyleValue> h, ValueComparingNonnullRefPtr<CSSStyleValue> alpha)
|
|
: CSSColorValue(ColorType::OKLCH)
|
|
, m_properties { .l = move(l), .c = move(c), .h = move(h), .alpha = move(alpha) }
|
|
{
|
|
}
|
|
|
|
struct Properties {
|
|
ValueComparingNonnullRefPtr<CSSStyleValue> l;
|
|
ValueComparingNonnullRefPtr<CSSStyleValue> c;
|
|
ValueComparingNonnullRefPtr<CSSStyleValue> h;
|
|
ValueComparingNonnullRefPtr<CSSStyleValue> alpha;
|
|
bool operator==(Properties const&) const = default;
|
|
} m_properties;
|
|
};
|
|
|
|
}
|