mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-08-06 08:10:02 +00:00
LibWeb: Add and implement CSSPropertyRule
IDL and bindings
This commit is contained in:
parent
648fac7215
commit
50d64b0fb7
Notes:
github-actions[bot]
2024-10-23 05:56:46 +00:00
Author: https://github.com/a-ungurianu 🔰
Commit: 50d64b0fb7
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1777
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/AtkinsSJ ✅
15 changed files with 160 additions and 1 deletions
|
@ -22,6 +22,7 @@ source_set("CSS") {
|
||||||
"CSSMediaRule.cpp",
|
"CSSMediaRule.cpp",
|
||||||
"CSSNamespaceRule.cpp",
|
"CSSNamespaceRule.cpp",
|
||||||
"CSSNumericType.cpp",
|
"CSSNumericType.cpp",
|
||||||
|
"CSSPropertyRule.cpp",
|
||||||
"CSSRule.cpp",
|
"CSSRule.cpp",
|
||||||
"CSSRuleList.cpp",
|
"CSSRuleList.cpp",
|
||||||
"CSSStyleDeclaration.cpp",
|
"CSSStyleDeclaration.cpp",
|
||||||
|
|
|
@ -45,6 +45,7 @@ standard_idl_files = [
|
||||||
"//Userland/Libraries/LibWeb/CSS/CSSLayerStatementRule.idl",
|
"//Userland/Libraries/LibWeb/CSS/CSSLayerStatementRule.idl",
|
||||||
"//Userland/Libraries/LibWeb/CSS/CSSMediaRule.idl",
|
"//Userland/Libraries/LibWeb/CSS/CSSMediaRule.idl",
|
||||||
"//Userland/Libraries/LibWeb/CSS/CSSNamespaceRule.idl",
|
"//Userland/Libraries/LibWeb/CSS/CSSNamespaceRule.idl",
|
||||||
|
"//Userland/Libraries/LibWeb/CSS/CSSPropertyRule.idl",
|
||||||
"//Userland/Libraries/LibWeb/CSS/CSSRule.idl",
|
"//Userland/Libraries/LibWeb/CSS/CSSRule.idl",
|
||||||
"//Userland/Libraries/LibWeb/CSS/CSSRuleList.idl",
|
"//Userland/Libraries/LibWeb/CSS/CSSRuleList.idl",
|
||||||
"//Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.idl",
|
"//Userland/Libraries/LibWeb/CSS/CSSStyleDeclaration.idl",
|
||||||
|
|
|
@ -44,6 +44,7 @@ CSSLayerStatementRule
|
||||||
CSSMediaRule
|
CSSMediaRule
|
||||||
CSSNamespaceRule
|
CSSNamespaceRule
|
||||||
CSSNestedDeclarations
|
CSSNestedDeclarations
|
||||||
|
CSSPropertyRule
|
||||||
CSSRule
|
CSSRule
|
||||||
CSSRuleList
|
CSSRuleList
|
||||||
CSSStyleDeclaration
|
CSSStyleDeclaration
|
||||||
|
|
|
@ -50,6 +50,7 @@ set(SOURCES
|
||||||
CSS/CSSNestedDeclarations.cpp
|
CSS/CSSNestedDeclarations.cpp
|
||||||
CSS/CSSNumericType.cpp
|
CSS/CSSNumericType.cpp
|
||||||
CSS/CSSNamespaceRule.cpp
|
CSS/CSSNamespaceRule.cpp
|
||||||
|
CSS/CSSPropertyRule.cpp
|
||||||
CSS/CSSRule.cpp
|
CSS/CSSRule.cpp
|
||||||
CSS/CSSRuleList.cpp
|
CSS/CSSRuleList.cpp
|
||||||
CSS/CSSStyleDeclaration.cpp
|
CSS/CSSStyleDeclaration.cpp
|
||||||
|
|
76
Userland/Libraries/LibWeb/CSS/CSSPropertyRule.cpp
Normal file
76
Userland/Libraries/LibWeb/CSS/CSSPropertyRule.cpp
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024, Alex Ungurianu <alex@ungurianu.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibWeb/Bindings/CSSPropertyRulePrototype.h>
|
||||||
|
#include <LibWeb/Bindings/Intrinsics.h>
|
||||||
|
#include <LibWeb/CSS/CSSPropertyRule.h>
|
||||||
|
#include <LibWeb/CSS/Serialize.h>
|
||||||
|
|
||||||
|
namespace Web::CSS {
|
||||||
|
|
||||||
|
JS_DEFINE_ALLOCATOR(CSSPropertyRule);
|
||||||
|
|
||||||
|
JS::NonnullGCPtr<CSSPropertyRule> CSSPropertyRule::create(JS::Realm& realm, FlyString name, FlyString syntax, bool inherits, Optional<String> initial_value)
|
||||||
|
{
|
||||||
|
return realm.heap().allocate<CSSPropertyRule>(realm, realm, move(name), move(syntax), inherits, move(initial_value));
|
||||||
|
}
|
||||||
|
|
||||||
|
CSSPropertyRule::CSSPropertyRule(JS::Realm& realm, FlyString name, FlyString syntax, bool inherits, Optional<String> initial_value)
|
||||||
|
: CSSRule(realm)
|
||||||
|
, m_name(move(name))
|
||||||
|
, m_syntax(move(syntax))
|
||||||
|
, m_inherits(inherits)
|
||||||
|
, m_initial_value(move(initial_value))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSSPropertyRule::initialize(JS::Realm& realm)
|
||||||
|
{
|
||||||
|
Base::initialize(realm);
|
||||||
|
WEB_SET_PROTOTYPE_FOR_INTERFACE(CSSPropertyRule);
|
||||||
|
}
|
||||||
|
|
||||||
|
// https://www.w3.org/TR/cssom-1/#serialize-a-css-rule
|
||||||
|
String CSSPropertyRule::serialized() const
|
||||||
|
{
|
||||||
|
StringBuilder builder;
|
||||||
|
|
||||||
|
// Serialization algorithm is defined in the spec below
|
||||||
|
// https://drafts.css-houdini.org/css-properties-values-api/#the-css-property-rule-interface
|
||||||
|
|
||||||
|
// To serialize a CSSPropertyRule, return the concatenation of the following:
|
||||||
|
|
||||||
|
// 1. The string "@property" followed by a single SPACE (U+0020).
|
||||||
|
// 2. The result of performing serialize an identifier on the rule’s name, followed by a single SPACE (U+0020).
|
||||||
|
builder.appendff("@property {} ", serialize_an_identifier(name()));
|
||||||
|
|
||||||
|
// 3. The string "{ ", i.e., a single LEFT CURLY BRACKET (U+007B), followed by a SPACE (U+0020).
|
||||||
|
builder.append("{ "sv);
|
||||||
|
|
||||||
|
// 4. The string "syntax:", followed by a single SPACE (U+0020).
|
||||||
|
// 5. The result of performing serialize a string on the rule’s syntax, followed by a single SEMICOLON (U+003B), followed by a SPACE (U+0020).
|
||||||
|
builder.appendff("syntax: {}; ", serialize_a_string(syntax()));
|
||||||
|
|
||||||
|
// 6. The string "inherits:", followed by a single SPACE (U+0020).
|
||||||
|
// 7. For the rule’s inherits attribute, one of the following depending on the attribute’s value:
|
||||||
|
// true: The string "true" followed by a single SEMICOLON (U+003B), followed by a SPACE (U+0020).
|
||||||
|
// false: The string "false" followed by a single SEMICOLON (U+003B), followed by a SPACE (U+0020).
|
||||||
|
builder.appendff("inherits: {}; ", inherits());
|
||||||
|
|
||||||
|
// 8. If the rule’s initial-value is present, follow these substeps:
|
||||||
|
if (initial_value().has_value()) {
|
||||||
|
// 1. The string "initial-value:".
|
||||||
|
// 2. The result of performing serialize a CSS value in the rule’s initial-value followed by a single SEMICOLON (U+003B), followed by a SPACE (U+0020).
|
||||||
|
// FIXME: Follow the spec for serializing the value whenever we actually have a CSS value here.
|
||||||
|
builder.appendff("initial-value: {}; ", initial_value());
|
||||||
|
}
|
||||||
|
// 9. A single RIGHT CURLY BRACKET (U+007D).
|
||||||
|
builder.append("}"sv);
|
||||||
|
|
||||||
|
return MUST(builder.to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
50
Userland/Libraries/LibWeb/CSS/CSSPropertyRule.h
Normal file
50
Userland/Libraries/LibWeb/CSS/CSSPropertyRule.h
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024, Alex Ungurianu <alex@ungurianu.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/FlyString.h>
|
||||||
|
#include <AK/NonnullRefPtr.h>
|
||||||
|
#include <AK/Optional.h>
|
||||||
|
#include <AK/String.h>
|
||||||
|
#include <LibWeb/CSS/CSSRule.h>
|
||||||
|
#include <LibWeb/Forward.h>
|
||||||
|
|
||||||
|
namespace Web::CSS {
|
||||||
|
|
||||||
|
// https://drafts.css-houdini.org/css-properties-values-api/#the-css-property-rule-interface
|
||||||
|
class CSSPropertyRule final : public CSSRule {
|
||||||
|
WEB_PLATFORM_OBJECT(CSSPropertyRule, CSSRule);
|
||||||
|
JS_DECLARE_ALLOCATOR(CSSPropertyRule);
|
||||||
|
|
||||||
|
public:
|
||||||
|
static JS::NonnullGCPtr<CSSPropertyRule> create(JS::Realm&, FlyString name, FlyString syntax, bool inherits, Optional<String> initial_value);
|
||||||
|
|
||||||
|
virtual ~CSSPropertyRule() = default;
|
||||||
|
|
||||||
|
virtual Type type() const override { return Type::Property; }
|
||||||
|
FlyString const& name() const { return m_name; }
|
||||||
|
FlyString const& syntax() const { return m_syntax; }
|
||||||
|
bool inherits() const { return m_inherits; }
|
||||||
|
Optional<String> initial_value() const { return m_initial_value; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
CSSPropertyRule(JS::Realm&, FlyString name, FlyString syntax, bool inherits, Optional<String> initial_value);
|
||||||
|
|
||||||
|
virtual void initialize(JS::Realm&) override;
|
||||||
|
virtual String serialized() const override;
|
||||||
|
|
||||||
|
FlyString m_name;
|
||||||
|
FlyString m_syntax;
|
||||||
|
bool m_inherits;
|
||||||
|
// FIXME: This should hold an actual CSS value, matching the syntax
|
||||||
|
Optional<String> m_initial_value;
|
||||||
|
};
|
||||||
|
|
||||||
|
template<>
|
||||||
|
inline bool CSSRule::fast_is<CSSPropertyRule>() const { return type() == CSSRule::Type::Property; }
|
||||||
|
|
||||||
|
}
|
11
Userland/Libraries/LibWeb/CSS/CSSPropertyRule.idl
Normal file
11
Userland/Libraries/LibWeb/CSS/CSSPropertyRule.idl
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
#import <CSS/CSSRule.idl>
|
||||||
|
|
||||||
|
// https://drafts.css-houdini.org/css-properties-values-api/#the-css-property-rule-interface
|
||||||
|
[Exposed=Window]
|
||||||
|
interface CSSPropertyRule : CSSRule {
|
||||||
|
readonly attribute CSSOMString name;
|
||||||
|
readonly attribute CSSOMString syntax;
|
||||||
|
readonly attribute boolean inherits;
|
||||||
|
readonly attribute CSSOMString? initialValue;
|
||||||
|
|
||||||
|
};
|
|
@ -81,6 +81,7 @@ FlyString const& CSSRule::parent_layer_internal_qualified_name_slow_case() const
|
||||||
case Type::Namespace:
|
case Type::Namespace:
|
||||||
case Type::Supports:
|
case Type::Supports:
|
||||||
case Type::NestedDeclarations:
|
case Type::NestedDeclarations:
|
||||||
|
case Type::Property:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,7 @@ public:
|
||||||
LayerBlock = 100,
|
LayerBlock = 100,
|
||||||
LayerStatement = 101,
|
LayerStatement = 101,
|
||||||
NestedDeclarations = 102,
|
NestedDeclarations = 102,
|
||||||
|
Property = 103, // FIXME: This should return `0` as a type, but type is used for a lot of dispatching
|
||||||
};
|
};
|
||||||
|
|
||||||
virtual Type type() const = 0;
|
virtual Type type() const = 0;
|
||||||
|
|
|
@ -146,6 +146,7 @@ void CSSRuleList::for_each_effective_rule(TraversalOrder order, Function<void(We
|
||||||
case CSSRule::Type::LayerStatement:
|
case CSSRule::Type::LayerStatement:
|
||||||
case CSSRule::Type::Namespace:
|
case CSSRule::Type::Namespace:
|
||||||
case CSSRule::Type::NestedDeclarations:
|
case CSSRule::Type::NestedDeclarations:
|
||||||
|
case CSSRule::Type::Property:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -195,6 +196,7 @@ bool CSSRuleList::evaluate_media_queries(HTML::Window const& window)
|
||||||
case CSSRule::Type::Namespace:
|
case CSSRule::Type::Namespace:
|
||||||
case CSSRule::Type::NestedDeclarations:
|
case CSSRule::Type::NestedDeclarations:
|
||||||
case CSSRule::Type::Style:
|
case CSSRule::Type::Style:
|
||||||
|
case CSSRule::Type::Property:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2694,6 +2694,7 @@ void StyleComputer::build_qualified_layer_names_cache()
|
||||||
case CSSRule::Type::Namespace:
|
case CSSRule::Type::Namespace:
|
||||||
case CSSRule::Type::NestedDeclarations:
|
case CSSRule::Type::NestedDeclarations:
|
||||||
case CSSRule::Type::Supports:
|
case CSSRule::Type::Supports:
|
||||||
|
case CSSRule::Type::Property:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include <LibWeb/CSS/CSSLayerStatementRule.h>
|
#include <LibWeb/CSS/CSSLayerStatementRule.h>
|
||||||
#include <LibWeb/CSS/CSSMediaRule.h>
|
#include <LibWeb/CSS/CSSMediaRule.h>
|
||||||
#include <LibWeb/CSS/CSSNestedDeclarations.h>
|
#include <LibWeb/CSS/CSSNestedDeclarations.h>
|
||||||
|
#include <LibWeb/CSS/CSSPropertyRule.h>
|
||||||
#include <LibWeb/CSS/CSSRule.h>
|
#include <LibWeb/CSS/CSSRule.h>
|
||||||
#include <LibWeb/CSS/CSSStyleRule.h>
|
#include <LibWeb/CSS/CSSStyleRule.h>
|
||||||
#include <LibWeb/CSS/CSSStyleSheet.h>
|
#include <LibWeb/CSS/CSSStyleSheet.h>
|
||||||
|
@ -651,6 +652,9 @@ void dump_rule(StringBuilder& builder, CSS::CSSRule const& rule, int indent_leve
|
||||||
case CSS::CSSRule::Type::Supports:
|
case CSS::CSSRule::Type::Supports:
|
||||||
dump_supports_rule(builder, verify_cast<CSS::CSSSupportsRule const>(rule), indent_levels);
|
dump_supports_rule(builder, verify_cast<CSS::CSSSupportsRule const>(rule), indent_levels);
|
||||||
break;
|
break;
|
||||||
|
case CSS::CSSRule::Type::Property:
|
||||||
|
dump_property_rule(builder, verify_cast<CSS::CSSPropertyRule const>(rule), indent_levels);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -804,6 +808,13 @@ void dump_declaration(StringBuilder& builder, CSS::PropertyOwningCSSStyleDeclara
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void dump_property_rule(StringBuilder& builder, CSS::CSSPropertyRule const& property, int indent_levels)
|
||||||
|
{
|
||||||
|
(void)builder;
|
||||||
|
(void)property;
|
||||||
|
(void)indent_levels;
|
||||||
|
}
|
||||||
|
|
||||||
void dump_style_rule(StringBuilder& builder, CSS::CSSStyleRule const& rule, int indent_levels)
|
void dump_style_rule(StringBuilder& builder, CSS::CSSStyleRule const& rule, int indent_levels)
|
||||||
{
|
{
|
||||||
for (auto& selector : rule.selectors()) {
|
for (auto& selector : rule.selectors()) {
|
||||||
|
@ -903,5 +914,4 @@ void dump_nested_declarations(StringBuilder& builder, CSS::CSSNestedDeclarations
|
||||||
builder.append(" Nested declarations:\n"sv);
|
builder.append(" Nested declarations:\n"sv);
|
||||||
dump_declaration(builder, declarations.declaration(), indent_levels + 1);
|
dump_declaration(builder, declarations.declaration(), indent_levels + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,7 @@ void dump_import_rule(StringBuilder&, CSS::CSSImportRule const&, int indent_leve
|
||||||
void dump_media_rule(StringBuilder&, CSS::CSSMediaRule const&, int indent_levels = 0);
|
void dump_media_rule(StringBuilder&, CSS::CSSMediaRule const&, int indent_levels = 0);
|
||||||
void dump_style_rule(StringBuilder&, CSS::CSSStyleRule const&, int indent_levels = 0);
|
void dump_style_rule(StringBuilder&, CSS::CSSStyleRule const&, int indent_levels = 0);
|
||||||
void dump_supports_rule(StringBuilder&, CSS::CSSSupportsRule const&, int indent_levels = 0);
|
void dump_supports_rule(StringBuilder&, CSS::CSSSupportsRule const&, int indent_levels = 0);
|
||||||
|
void dump_property_rule(StringBuilder&, CSS::CSSPropertyRule const&, int indent_levels = 0);
|
||||||
void dump_namespace_rule(StringBuilder&, CSS::CSSNamespaceRule const&, int indent_levels = 0);
|
void dump_namespace_rule(StringBuilder&, CSS::CSSNamespaceRule const&, int indent_levels = 0);
|
||||||
void dump_nested_declarations(StringBuilder&, CSS::CSSNestedDeclarations const&, int indent_levels = 0);
|
void dump_nested_declarations(StringBuilder&, CSS::CSSNestedDeclarations const&, int indent_levels = 0);
|
||||||
void dump_layer_block_rule(StringBuilder&, CSS::CSSLayerBlockRule const&, int indent_levels = 0);
|
void dump_layer_block_rule(StringBuilder&, CSS::CSSLayerBlockRule const&, int indent_levels = 0);
|
||||||
|
|
|
@ -131,6 +131,7 @@ class CSSMediaRule;
|
||||||
class CSSNestedDeclarations;
|
class CSSNestedDeclarations;
|
||||||
class CSSOKLab;
|
class CSSOKLab;
|
||||||
class CSSOKLCH;
|
class CSSOKLCH;
|
||||||
|
class CSSPropertyRule;
|
||||||
class CSSRGB;
|
class CSSRGB;
|
||||||
class CSSRule;
|
class CSSRule;
|
||||||
class CSSRuleList;
|
class CSSRuleList;
|
||||||
|
|
|
@ -26,6 +26,7 @@ libweb_js_bindings(CSS/CSSMediaRule)
|
||||||
libweb_js_bindings(CSS/CSS NAMESPACE)
|
libweb_js_bindings(CSS/CSS NAMESPACE)
|
||||||
libweb_js_bindings(CSS/CSSNamespaceRule)
|
libweb_js_bindings(CSS/CSSNamespaceRule)
|
||||||
libweb_js_bindings(CSS/CSSNestedDeclarations)
|
libweb_js_bindings(CSS/CSSNestedDeclarations)
|
||||||
|
libweb_js_bindings(CSS/CSSPropertyRule)
|
||||||
libweb_js_bindings(CSS/CSSRule)
|
libweb_js_bindings(CSS/CSSRule)
|
||||||
libweb_js_bindings(CSS/CSSRuleList)
|
libweb_js_bindings(CSS/CSSRuleList)
|
||||||
libweb_js_bindings(CSS/CSSStyleDeclaration)
|
libweb_js_bindings(CSS/CSSStyleDeclaration)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue