eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-25 17:25:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Replace ViewFunctionStyleValue with FunctionStyleValue

Browse Source
This commit is contained in:
Callum Law
2026-04-23 01:39:28 +12:00
committed by Sam Atkins
parent 6aeaf69cd3
commit 6b7fb4b273
Notes: github-actions[bot] 2026-04-24 06:35:58 +00:00 
Author: https://github.com/Calme1709
Commit: https://github.com/LadybirdBrowser/ladybird/commit/6b7fb4b273d
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/9039
Reviewed-by: https://github.com/AtkinsSJ ✅
9 changed files with 28 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Libraries/LibWeb/CMakeLists.txt
View File

@@ -293,7 +293,6 @@ set(SOURCES
CSS/StyleValues/TupleStyleValue.cpp
CSS/StyleValues/UnicodeRangeStyleValue.cpp
CSS/StyleValues/UnresolvedStyleValue.cpp
CSS/StyleValues/ViewFunctionStyleValue.cpp
CSS/Supports.cpp
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
CSS/SystemColor.cpp

2
Libraries/LibWeb/CSS/Parser/Parser.h
View File

@@ -462,7 +462,7 @@ private:
RefPtr<StyleValue const> parse_view_timeline_inset_value(TokenStream<ComponentValue>&);
RefPtr<FunctionStyleValue const> parse_scroll_function_value(TokenStream<ComponentValue>&);
RefPtr<ViewFunctionStyleValue const> parse_view_function_value(TokenStream<ComponentValue>&);
RefPtr<FunctionStyleValue const> parse_view_function_value(TokenStream<ComponentValue>&);
using ParseFunction = AK::Function<RefPtr<StyleValue const>(TokenStream<ComponentValue>&)>;
RefPtr<StyleValueList const> parse_comma_separated_value_list(TokenStream<ComponentValue>&, ParseFunction);

37
Libraries/LibWeb/CSS/Parser/ValueParsing.cpp
View File

@@ -78,7 +78,6 @@
#include <LibWeb/CSS/StyleValues/URLStyleValue.h>
#include <LibWeb/CSS/StyleValues/UnicodeRangeStyleValue.h>
#include <LibWeb/CSS/StyleValues/UnresolvedStyleValue.h>
#include <LibWeb/CSS/StyleValues/ViewFunctionStyleValue.h>
#include <LibWeb/DOM/Element.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Infra/CharacterTypes.h>
@@ -1302,7 +1301,7 @@ RefPtr<FunctionStyleValue const> Parser::parse_scroll_function_value(TokenStream
}
// https://drafts.csswg.org/scroll-animations-1/#funcdef-view
RefPtr<ViewFunctionStyleValue const> Parser::parse_view_function_value(TokenStream<ComponentValue>& tokens)
RefPtr<FunctionStyleValue const> Parser::parse_view_function_value(TokenStream<ComponentValue>& tokens)
{
// <view()> = view( [ <axis> || <'view-timeline-inset'> ]? )
auto transaction = tokens.begin_transaction();
@@ -1312,8 +1311,11 @@ RefPtr<ViewFunctionStyleValue const> Parser::parse_view_function_value(TokenStre
auto context_guard = push_temporary_value_parsing_context(FunctionContext { "view"sv });
Optional<Axis> axis;
RefPtr<StyleValue const> inset;
StyleValueTuple tuple;
tuple.resize_with_default_value(2, nullptr);
bool has_axis = false;
bool has_inset = false;
auto argument_tokens = TokenStream { function_token.function().value };
@@ -1324,33 +1326,36 @@ RefPtr<ViewFunctionStyleValue const> Parser::parse_view_function_value(TokenStre
break;
if (auto inset_value = parse_view_timeline_inset_value(argument_tokens); inset_value) {
if (inset)
if (has_inset)
return nullptr;
inset = inset_value;
auto const& inset_values = inset_value->as_value_list().values();
// NB: The default value of <'view-timeline-inset'> `auto auto` is omitted from the serialization.
if (inset_values[0]->to_keyword() != Keyword::Auto || inset_values[1]->to_keyword() != Keyword::Auto)
tuple[TupleStyleValue::Indices::ViewFunction::Inset] = inset_value;
has_inset = true;
continue;
}
if (auto keyword_value = parse_keyword_value(argument_tokens); keyword_value && keyword_to_axis(keyword_value->to_keyword()).has_value()) {
if (axis.has_value())
if (has_axis)
return nullptr;
axis = keyword_to_axis(keyword_value->to_keyword());
// NB: The default value of <axis> `block` is omitted from the serialization.
if (keyword_value->to_keyword() != Keyword::Block)
tuple[TupleStyleValue::Indices::ViewFunction::Axis] = keyword_value;
has_axis = true;
continue;
}
return nullptr;
}
// By default, view() references the block axis
if (!axis.has_value())
axis = Axis::Block;
if (!inset)
inset = StyleValueList::create({ KeywordStyleValue::create(Keyword::Auto), KeywordStyleValue::create(Keyword::Auto) }, StyleValueList::Separator::Space);
transaction.commit();
return ViewFunctionStyleValue::create(axis.value(), inset.release_nonnull());
return FunctionStyleValue::create("view"_fly_string, TupleStyleValue::create(move(tuple)));
}
// https://www.w3.org/TR/CSS2/visufx.html#value-def-shape

1
Libraries/LibWeb/CSS/StyleValues/StyleValue.cpp
View File

@@ -83,7 +83,6 @@
#include <LibWeb/CSS/StyleValues/URLStyleValue.h>
#include <LibWeb/CSS/StyleValues/UnicodeRangeStyleValue.h>
#include <LibWeb/CSS/StyleValues/UnresolvedStyleValue.h>
#include <LibWeb/CSS/StyleValues/ViewFunctionStyleValue.h>
#include <LibWeb/CSS/SystemColor.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/Navigable.h>

3
Libraries/LibWeb/CSS/StyleValues/StyleValue.h
View File

@@ -100,8 +100,7 @@ namespace Web::CSS {
__ENUMERATE_CSS_STYLE_VALUE_TYPE(UnicodeRange, unicode_range, UnicodeRangeStyleValue) \
__ENUMERATE_CSS_STYLE_VALUE_TYPE(Unresolved, unresolved, UnresolvedStyleValue) \
__ENUMERATE_CSS_STYLE_VALUE_TYPE(URL, url, URLStyleValue) \
__ENUMERATE_CSS_STYLE_VALUE_TYPE(ValueList, value_list, StyleValueList) \
__ENUMERATE_CSS_STYLE_VALUE_TYPE(ViewFunction, view_function, ViewFunctionStyleValue)
__ENUMERATE_CSS_STYLE_VALUE_TYPE(ValueList, value_list, StyleValueList)
struct ColorResolutionContext {
Optional<PreferredColorScheme> color_scheme;

5
Libraries/LibWeb/CSS/StyleValues/TupleStyleValue.h
View File

@@ -58,6 +58,11 @@ public:
static constexpr size_t Scroller = 0;
static constexpr size_t Axis = 1;
};
struct ViewFunction {
static constexpr size_t Axis = 0;
static constexpr size_t Inset = 1;
};
};
private:

41
Libraries/LibWeb/CSS/StyleValues/ViewFunctionStyleValue.cpp
View File

@@ -1,41 +0,0 @@
/*
* Copyright (c) 2025, Callum Law <callumlaw1709@outlook.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "ViewFunctionStyleValue.h"
#include <LibWeb/CSS/Enums.h>
namespace Web::CSS {
void ViewFunctionStyleValue::serialize(StringBuilder& builder, SerializationMode mode) const
{
builder.append("view("sv);
if (m_axis != Axis::Block)
builder.append(CSS::to_string(m_axis));
auto stringified_inset = m_inset->to_string(mode);
if (stringified_inset != "auto"sv) {
if (m_axis != Axis::Block)
builder.append(' ');
m_inset->serialize(builder, mode);
}
builder.append(')');
}
ValueComparingNonnullRefPtr<StyleValue const> ViewFunctionStyleValue::absolutized(ComputationContext const& computation_context) const
{
auto absolutized_inset = m_inset->absolutized(computation_context);
if (absolutized_inset == m_inset)
return *this;
return ViewFunctionStyleValue::create(m_axis, absolutized_inset);
}
}

42
Libraries/LibWeb/CSS/StyleValues/ViewFunctionStyleValue.h
View File

@@ -1,42 +0,0 @@
/*
* Copyright (c) 2025, Callum Law <callumlaw1709@outlook.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibWeb/CSS/StyleValues/StyleValue.h>
namespace Web::CSS {
class ViewFunctionStyleValue final : public StyleValueWithDefaultOperators<ViewFunctionStyleValue> {
public:
static ValueComparingNonnullRefPtr<ViewFunctionStyleValue const> create(Axis axis, NonnullRefPtr<StyleValue const> inset)
{
return adopt_ref(*new ViewFunctionStyleValue(axis, move(inset)));
}
virtual ~ViewFunctionStyleValue() override = default;
virtual void serialize(StringBuilder&, SerializationMode) const override;
bool properties_equal(ViewFunctionStyleValue const& other) const { return m_axis == other.m_axis && m_inset == other.m_inset; }
virtual ValueComparingNonnullRefPtr<StyleValue const> absolutized(ComputationContext const&) const override;
Axis axis() const { return m_axis; }
NonnullRefPtr<StyleValue const> inset() const { return m_inset; }
virtual bool is_computationally_independent() const override { return m_inset->is_computationally_independent(); }
private:
explicit ViewFunctionStyleValue(Axis axis, NonnullRefPtr<StyleValue const> inset)
: StyleValueWithDefaultOperators(Type::ViewFunction)
, m_axis(axis)
, m_inset(move(inset))
{
}
Axis m_axis;
ValueComparingNonnullRefPtr<StyleValue const> m_inset;
};
}

1
Libraries/LibWeb/Forward.h
View File

@@ -411,7 +411,6 @@ class UnicodeRangeStyleValue;
class UnresolvedStyleValue;
class URL;
class URLStyleValue;
class ViewFunctionStyleValue;
class VisualViewport;
enum class FontFeatureValueType : u8;