RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:47:34 +00:00
Code Issues Activity Actions

LibWeb: Add FlyString variants of get_element_by_id

Browse source 
Unfortunately we can't port these functions entirely over to FlyString
from DeprecatedString as Document includes NonElementParentNode and has
not yet been ported over to new AK string. In the mean time, this should
help up in porting over NonElementParentNode itself.
This commit is contained in:
Shannon Booth 2023-09-11 18:23:48 +12:00 • committed by Sam Atkins
parent b2f3aa1c76
commit 3e0849eb4f
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWeb/DOM/NonElementParentNode.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <AK/FlyString.h>
#include <AK/Forward.h>
#include <LibJS/Heap/GCPtr.h>
#include <LibWeb/Forward.h>
@ -17,6 +18,11 @@ namespace Web::DOM {
template<typename NodeType>
class NonElementParentNode {
public:
JS::GCPtr<Element const> get_element_by_id(FlyString const& id) const
{
return get_element_by_id(id.to_deprecated_fly_string());
}
JS::GCPtr<Element const> get_element_by_id(DeprecatedFlyString const& id) const
{
JS::GCPtr<Element const> found_element;
@ -30,6 +36,11 @@ public:
return found_element;
}
JS::GCPtr<Element> get_element_by_id(FlyString const& id)
{
return get_element_by_id(id.to_deprecated_fly_string());
}
JS::GCPtr<Element> get_element_by_id(DeprecatedFlyString const& id)
{
JS::GCPtr<Element> found_element;

2
Userland/Libraries/LibWeb/SVG/SVGGradientElement.cpp
View file

@ -100,7 +100,7 @@ JS::GCPtr<SVGGradientElement const> SVGGradientElement::linked_gradient() const
auto id = url.fragment();
if (!id.has_value() || id->is_empty())
return {};
auto element = document().get_element_by_id(id->to_deprecated_string());
auto element = document().get_element_by_id(id.value());
if (!element)
return {};
if (!is<SVGGradientElement>(*element))

2
Userland/Libraries/LibWeb/SVG/SVGGraphicsElement.cpp
View file

@ -49,7 +49,7 @@ Optional<Gfx::PaintStyle const&> SVGGraphicsElement::svg_paint_computed_value_to
auto const& url = paint_value->as_url();
if (!url.fragment().has_value())
return {};
auto gradient = document().get_element_by_id(url.fragment()->to_deprecated_string());
auto gradient = document().get_element_by_id(url.fragment().value());
if (!gradient)
return {};
if (is<SVG::SVGGradientElement>(*gradient))