system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Port HTMLToken::to_deprecated_string to new AK String

Browse source
This commit is contained in:
Shannon Booth 2023-11-05 11:45:55 +13:00 committed by Andreas Kling
parent d00c030fce
commit 1f8d72da8e
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibWeb/TestHTMLTokenizer.cpp
View file

@ -91,7 +91,7 @@ static u32 hash_tokens(Vector<Token> const& tokens)
{
StringBuilder builder;
for (auto& token : tokens)
builder.append(token.to_deprecated_string());
builder.append(token.to_string());
return (u32)builder.string_view().hash();
}

2
Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp
View file

@ -179,7 +179,7 @@ void HTMLParser::run()
break;
auto& token = optional_token.value();
dbgln_if(HTML_PARSER_DEBUG, "[{}] {}", insertion_mode_name(), token.to_deprecated_string());
dbgln_if(HTML_PARSER_DEBUG, "[{}] {}", insertion_mode_name(), token.to_string());
// https://html.spec.whatwg.org/multipage/parsing.html#tree-construction-dispatcher
// As each token is emitted from the tokenizer, the user agent must follow the appropriate steps from the following list, known as the tree construction dispatcher:

4
Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp
View file

@ -8,7 +8,7 @@
namespace Web::HTML {
DeprecatedString HTMLToken::to_deprecated_string() const
String HTMLToken::to_string() const
{
StringBuilder builder;
@ -70,7 +70,7 @@ DeprecatedString HTMLToken::to_deprecated_string() const
builder.appendff("@{}:{}-{}:{}", m_start_position.line, m_start_position.column, m_end_position.line, m_end_position.column);
}
return builder.to_deprecated_string();
return MUST(builder.to_string());
}
}

4
Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h
View file

@ -7,8 +7,6 @@
#pragma once
#include <AK/DeprecatedFlyString.h>
#include <AK/DeprecatedString.h>
#include <AK/FlyString.h>
#include <AK/Function.h>
#include <AK/OwnPtr.h>
@ -322,7 +320,7 @@ public:
Type type() const { return m_type; }
DeprecatedString to_deprecated_string() const;
String to_string() const;
Position const& start_position() const { return m_start_position; }
Position const& end_position() const { return m_end_position; }

2
Userland/Libraries/LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp
View file

@ -73,7 +73,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
auto token = tokenizer.next_token();
if (!token.has_value() || token.value().is_end_of_file())
break;
dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "(HTML::SyntaxHighlighter) got token of type {}", token->to_deprecated_string());
dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "(HTML::SyntaxHighlighter) got token of type {}", token->to_string());
if (token->is_start_tag()) {
if (token->tag_name() == "script"sv) {