From 6848a0ef057579ab323eec28437df183811fd3b0 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Tue, 12 Apr 2022 14:14:00 +0100 Subject: [PATCH] LibWeb: Move Declaration code into Declaration.cpp --- Userland/Libraries/LibWeb/CMakeLists.txt | 1 + .../LibWeb/CSS/Parser/Declaration.cpp | 30 +++++++++++++++++++ .../LibWeb/CSS/Parser/StyleRules.cpp | 17 ----------- 3 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 560da1fc2f..07b583af8d 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -46,6 +46,7 @@ set(SOURCES CSS/MediaQueryList.cpp CSS/Parser/Block.cpp CSS/Parser/ComponentValue.cpp + CSS/Parser/Declaration.cpp CSS/Parser/Function.cpp CSS/Parser/Parser.cpp CSS/Parser/StyleRules.cpp diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp new file mode 100644 index 0000000000..6388d36c1d --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/Parser/Declaration.cpp @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2020-2021, the SerenityOS developers. + * Copyright (c) 2021-2022, Sam Atkins + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +namespace Web::CSS { + +Declaration::Declaration() = default; +Declaration::~Declaration() = default; + +String Declaration::to_string() const +{ + StringBuilder builder; + + serialize_an_identifier(builder, m_name); + builder.append(": "); + builder.join(" ", m_values); + + if (m_important == Important::Yes) + builder.append(" !important"); + + return builder.to_string(); +} + +} diff --git a/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp b/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp index 20065c9b58..cfd4012ccd 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/StyleRules.cpp @@ -33,9 +33,6 @@ StyleRule::StyleRule(StyleRule::Type type) } StyleRule::~StyleRule() = default; -Declaration::Declaration() = default; -Declaration::~Declaration() = default; - template void append_with_to_string(StringBuilder& builder, SeparatorType& separator, CollectionType& collection) { @@ -83,18 +80,4 @@ String StyleRule::to_string() const return builder.to_string(); } - -String Declaration::to_string() const -{ - StringBuilder builder; - - serialize_an_identifier(builder, m_name); - builder.append(": "); - append_with_to_string(builder, " ", m_values); - - if (m_important == Important::Yes) - builder.append(" !important"); - - return builder.to_string(); -} }