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

LibWeb: Convert Web::DOM::Position::to_deprecated_string to String

Browse source
This commit is contained in:
Timothy Flynn 2023-03-01 06:53:27 -05:00 • committed by Linus Groh
parent cd5868a0f1
commit 2c4acba883
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/DOM/Position.cpp
View file

@ -18,11 +18,11 @@ Position::Position(Node& node, unsigned offset)
{ {
} }
DeprecatedString Position::to_deprecated_string() const ErrorOr<String> Position::to_string() const
{ {
if (!node()) if (!node())
return DeprecatedString::formatted("DOM::Position(nullptr, {})", offset()); return String::formatted("DOM::Position(nullptr, {})", offset());
return DeprecatedString::formatted("DOM::Position({} ({})), {})", node()->node_name(), node(), offset()); return String::formatted("DOM::Position({} ({})), {})", node()->node_name(), node(), offset());
} }
bool Position::increment_offset() bool Position::increment_offset()

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

@ -7,7 +7,9 @@
#pragma once #pragma once
#include <AK/Error.h>
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/String.h>
#include <LibJS/Heap/Handle.h> #include <LibJS/Heap/Handle.h>
#include <LibWeb/DOM/Node.h> #include <LibWeb/DOM/Node.h>
#include <LibWeb/Forward.h> #include <LibWeb/Forward.h>
@ -35,7 +37,7 @@ public:
return m_node.ptr() == other.m_node.ptr() && m_offset == other.m_offset; return m_node.ptr() == other.m_node.ptr() && m_offset == other.m_offset;
} }
DeprecatedString to_deprecated_string() const; ErrorOr<String> to_string() const;
private: private:
JS::Handle<Node> m_node; JS::Handle<Node> m_node;
@ -44,13 +46,10 @@ private:
} }
namespace AK {
template<> template<>
struct Formatter<Web::DOM::Position> : Formatter<StringView> { struct AK::Formatter<Web::DOM::Position> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& builder, Web::DOM::Position const& value) ErrorOr<void> format(FormatBuilder& builder, Web::DOM::Position const& value)
{ {
return Formatter<StringView>::format(builder, value.to_deprecated_string()); return Formatter<StringView>::format(builder, TRY(value.to_string()));
} }
}; };
}