LibWeb/DOM: Rename ElementReference to AbstractElement

This isn't some kind of identifier, it's a handle on an actual Element
or PseudoElement.
This commit is contained in:
Sam Atkins 2025-06-18 10:19:56 +01:00
commit ce380a59c7
Notes: github-actions[bot] 2025-06-19 11:37:42 +00:00
10 changed files with 73 additions and 23 deletions

View file

@ -0,0 +1,48 @@
/*
* Copyright (c) 2024-2025, Sam Atkins <sam@ladybird.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibWeb/DOM/AbstractElement.h>
namespace Web::DOM {
AbstractElement::AbstractElement(GC::Ref<Element> element, Optional<CSS::PseudoElement> pseudo_element)
: m_element(element)
, m_pseudo_element(move(pseudo_element))
{
}
void AbstractElement::visit(GC::Cell::Visitor& visitor) const
{
visitor.visit(m_element);
}
GC::Ptr<Element const> AbstractElement::parent_element() const
{
if (m_pseudo_element.has_value())
return m_element;
return m_element->parent_element();
}
GC::Ptr<CSS::ComputedProperties const> AbstractElement::computed_properties() const
{
if (m_pseudo_element.has_value())
return m_element->pseudo_element_computed_properties(*m_pseudo_element);
return m_element->computed_properties();
}
CSS::CountersSet& AbstractElement::ensure_counters_set()
{
// FIXME: Handle pseudo-elements
return m_element->ensure_counters_set();
}
void AbstractElement::set_counters_set(OwnPtr<CSS::CountersSet>&& counters_set)
{
// FIXME: Handle pseudo-elements
m_element->set_counters_set(move(counters_set));
}
}

View file

@ -12,22 +12,22 @@
namespace Web::DOM {
class ElementReference {
// Either an Element or a PseudoElement
class AbstractElement {
public:
ElementReference(GC::Ref<Element> element, Optional<CSS::PseudoElement> pseudo_element = {})
: m_element(element)
, m_pseudo_element(move(pseudo_element))
{
}
AbstractElement(GC::Ref<Element>, Optional<CSS::PseudoElement> = {});
Element& element() { return m_element; }
Element const& element() const { return m_element; }
Optional<CSS::PseudoElement> pseudo_element() const { return m_pseudo_element; }
void visit(GC::Cell::Visitor& visitor) const
{
visitor.visit(m_element);
}
GC::Ptr<Element const> parent_element() const;
GC::Ptr<CSS::ComputedProperties const> computed_properties() const;
CSS::CountersSet& ensure_counters_set();
void set_counters_set(OwnPtr<CSS::CountersSet>&&);
void visit(GC::Cell::Visitor& visitor) const;
private:
GC::Ref<Element> m_element;

View file

@ -832,7 +832,7 @@ CSS::RequiredInvalidationAfterStyleChange Element::recompute_inherited_style()
GC::Ref<CSS::ComputedProperties> Element::resolved_css_values(Optional<CSS::PseudoElement> type)
{
auto element_computed_style = CSS::CSSStyleProperties::create_resolved_style(realm(), ElementReference { *this, type });
auto element_computed_style = CSS::CSSStyleProperties::create_resolved_style(realm(), AbstractElement { *this, type });
auto properties = heap().allocate<CSS::ComputedProperties>();
for (auto i = to_underlying(CSS::first_property_id); i <= to_underlying(CSS::last_property_id); ++i) {