RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 14:48:14 +00:00
Code Issues Activity Actions

LibHTML: Respect the CSS "color" property for text

Browse source 
Also remove the color values from the ComputedStyle object and get them
via StyleProperties instead.

At the moment, we only handle colors that Color::from_string() parses.
This commit is contained in:
Andreas Kling 2019-09-28 22:18:19 +02:00
parent b8cab2a934
commit 62cbaa74f3
7 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibHTML/CSS/StyleProperties.cpp
View file

@ -28,3 +28,13 @@ String StyleProperties::string_or_fallback(const StringView& property_name, cons
return fallback;
return value.value()->to_string();
}
Color StyleProperties::color_or_fallback(const StringView& property_name, Color fallback) const
{
auto value = property(property_name);
if (!value.has_value())
return fallback;
if (value.value()->type() != StyleValue::Type::Color)
return fallback;
return static_cast<ColorStyleValue&>(*value.value()).color();
}

3
Libraries/LibHTML/CSS/StyleProperties.h
View file

@ -4,6 +4,8 @@
#include <AK/NonnullRefPtr.h>
#include <LibHTML/CSS/StyleValue.h>
class Color;
class StyleProperties {
public:
template<typename Callback>
@ -18,6 +20,7 @@ public:
Length length_or_fallback(const StringView& property_name, const Length& fallback) const;
String string_or_fallback(const StringView& property_name, const StringView& fallback) const;
Color color_or_fallback(const StringView& property_name, Color fallback) const;
private:
HashMap<String, NonnullRefPtr<StyleValue>> m_property_values;

2
Libraries/LibHTML/CSS/StyleResolver.cpp
View file

@ -63,7 +63,7 @@ StyleProperties StyleResolver::resolve_style(const Element& element, const Style
if (parent_properties) {
parent_properties->for_each_property([&](const StringView& name, auto& value) {
// TODO: proper inheritance
if (name.starts_with("font") || name == "white-space")
if (name.starts_with("font") || name == "white-space" || name == "color")
style_properties.set_property(name, value);
});
}

25
Libraries/LibHTML/CSS/StyleValue.h
View file

@ -1,9 +1,10 @@
#pragma once
#include <AK/String.h>
#include <AK/RefCounted.h>
#include <AK/RefPtr.h>
#include <AK/String.h>
#include <AK/StringView.h>
#include <LibDraw/Color.h>
#include <LibHTML/CSS/Length.h>
class StyleValue : public RefCounted<StyleValue> {
@ -16,6 +17,7 @@ public:
Initial,
String,
Length,
Color,
};
Type type() const { return m_type; }
@ -107,3 +109,24 @@ private:
{
}
};
class ColorStyleValue : public StyleValue {
public:
static NonnullRefPtr<ColorStyleValue> create(Color color)
{
return adopt(*new ColorStyleValue(color));
}
virtual ~ColorStyleValue() override {}
Color color() const { return m_color; }
String to_string() const override { return String::format("COLOR: %s", m_color.to_string().characters()); }
private:
explicit ColorStyleValue(Color color)
: StyleValue(Type::Color)
, m_color(color)
{
}
Color m_color;
};