RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:48:12 +00:00
Code Issues Activity Actions

LibWeb: Remove StringBuilders from HTMLToken::m_doctype

Browse source
This commit is contained in:
Gunnar Beutner 2021-05-23 08:20:03 +02:00 • committed by Andreas Kling
parent 2150609590
commit 992964aa7d
5 changed files with 60 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/HTML/Parser/HTMLDocumentParser.cpp
View file

@ -262,11 +262,11 @@ DOM::QuirksMode HTMLDocumentParser::which_quirks_mode(const HTMLToken& doctype_t
return DOM::QuirksMode::Yes; return DOM::QuirksMode::Yes;
// NOTE: The tokenizer puts the name into lower case for us. // NOTE: The tokenizer puts the name into lower case for us.
if (doctype_token.m_doctype.name.to_string() != "html") if (doctype_token.m_doctype.name != "html")
return DOM::QuirksMode::Yes; return DOM::QuirksMode::Yes;
auto public_identifier = doctype_token.m_doctype.public_identifier.to_string(); auto const& public_identifier = doctype_token.m_doctype.public_identifier;
auto system_identifier = doctype_token.m_doctype.system_identifier.to_string(); auto const& system_identifier = doctype_token.m_doctype.system_identifier;
if (public_identifier.equals_ignoring_case("-//W3O//DTD W3 HTML Strict 3.0//EN//")) if (public_identifier.equals_ignoring_case("-//W3O//DTD W3 HTML Strict 3.0//EN//"))
return DOM::QuirksMode::Yes; return DOM::QuirksMode::Yes;
@ -324,9 +324,9 @@ void HTMLDocumentParser::handle_initial(HTMLToken& token)
if (token.is_doctype()) { if (token.is_doctype()) {
auto doctype = adopt_ref(*new DOM::DocumentType(document())); auto doctype = adopt_ref(*new DOM::DocumentType(document()));
doctype->set_name(token.m_doctype.name.to_string()); doctype->set_name(token.m_doctype.name);
doctype->set_public_id(token.m_doctype.public_identifier.to_string()); doctype->set_public_id(token.m_doctype.public_identifier);
doctype->set_system_id(token.m_doctype.system_identifier.to_string()); doctype->set_system_id(token.m_doctype.system_identifier);
document().append_child(move(doctype)); document().append_child(move(doctype));
document().set_quirks_mode(which_quirks_mode(token)); document().set_quirks_mode(which_quirks_mode(token));
m_insertion_mode = InsertionMode::BeforeHTML; m_insertion_mode = InsertionMode::BeforeHTML;

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

@ -16,7 +16,7 @@ String HTMLToken::to_string() const
case HTMLToken::Type::DOCTYPE: case HTMLToken::Type::DOCTYPE:
builder.append("DOCTYPE"); builder.append("DOCTYPE");
builder.append(" { name: '"); builder.append(" { name: '");
builder.append(m_doctype.name.to_string()); builder.append(m_doctype.name);
builder.append("' }"); builder.append("' }");
break; break;
case HTMLToken::Type::StartTag: case HTMLToken::Type::StartTag:

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

@ -194,11 +194,11 @@ private:
struct { struct {
// NOTE: "Missing" is a distinct state from the empty string. // NOTE: "Missing" is a distinct state from the empty string.
StringBuilder name; String name;
bool missing_name { true }; bool missing_name { true };
StringBuilder public_identifier; String public_identifier;
bool missing_public_identifier { true }; bool missing_public_identifier { true };
StringBuilder system_identifier; String system_identifier;
bool missing_system_identifier { true }; bool missing_system_identifier { true };
bool force_quirks { false }; bool force_quirks { false };
} m_doctype; } m_doctype;

83
Userland/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.cpp
View file

@ -20,12 +20,18 @@ namespace Web::HTML {
#define CONSUME_NEXT_INPUT_CHARACTER \ #define CONSUME_NEXT_INPUT_CHARACTER \
current_input_character = next_code_point(); current_input_character = next_code_point();
#define SWITCH_TO(new_state) \ #define SWITCH_TO(new_state) \
do { \ do { \
will_switch_to(State::new_state); \ VERIFY(m_current_builder.is_empty()); \
m_state = State::new_state; \ SWITCH_TO_WITH_UNCLEAN_BUILDER(new_state); \
CONSUME_NEXT_INPUT_CHARACTER; \ } while (0)
goto new_state; \
#define SWITCH_TO_WITH_UNCLEAN_BUILDER(new_state) \
do { \
will_switch_to(State::new_state); \
m_state = State::new_state; \
CONSUME_NEXT_INPUT_CHARACTER; \
goto new_state; \
} while (0) } while (0)
#define RECONSUME_IN(new_state) \ #define RECONSUME_IN(new_state) \
@ -449,17 +455,17 @@ _StartOfFunction:
ON_ASCII_UPPER_ALPHA ON_ASCII_UPPER_ALPHA
{ {
create_new_token(HTMLToken::Type::DOCTYPE); create_new_token(HTMLToken::Type::DOCTYPE);
m_current_token.m_doctype.name.append(to_ascii_lowercase(current_input_character.value())); m_current_builder.append_code_point(to_ascii_lowercase(current_input_character.value()));
m_current_token.m_doctype.missing_name = false; m_current_token.m_doctype.missing_name = false;
SWITCH_TO(DOCTYPEName); SWITCH_TO_WITH_UNCLEAN_BUILDER(DOCTYPEName);
} }
ON(0) ON(0)
{ {
log_parse_error(); log_parse_error();
create_new_token(HTMLToken::Type::DOCTYPE); create_new_token(HTMLToken::Type::DOCTYPE);
m_current_token.m_doctype.name.append_code_point(0xFFFD); m_current_builder.append_code_point(0xFFFD);
m_current_token.m_doctype.missing_name = false; m_current_token.m_doctype.missing_name = false;
SWITCH_TO(DOCTYPEName); SWITCH_TO_WITH_UNCLEAN_BUILDER(DOCTYPEName);
} }
ON('>') ON('>')
{ {
@ -479,9 +485,9 @@ _StartOfFunction:
ANYTHING_ELSE ANYTHING_ELSE
{ {
create_new_token(HTMLToken::Type::DOCTYPE); create_new_token(HTMLToken::Type::DOCTYPE);
m_current_token.m_doctype.name.append_code_point(current_input_character.value()); m_current_builder.append_code_point(current_input_character.value());
m_current_token.m_doctype.missing_name = false; m_current_token.m_doctype.missing_name = false;
SWITCH_TO(DOCTYPEName); SWITCH_TO_WITH_UNCLEAN_BUILDER(DOCTYPEName);
} }
} }
END_STATE END_STATE
@ -490,21 +496,23 @@ _StartOfFunction:
{ {
ON_WHITESPACE ON_WHITESPACE
{ {
m_current_token.m_doctype.name = consume_current_builder();
SWITCH_TO(AfterDOCTYPEName); SWITCH_TO(AfterDOCTYPEName);
} }
ON('>') ON('>')
{ {
m_current_token.m_doctype.name = consume_current_builder();
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data); SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
} }
ON_ASCII_UPPER_ALPHA ON_ASCII_UPPER_ALPHA
{ {
m_current_token.m_doctype.name.append(to_ascii_lowercase(current_input_character.value())); m_current_builder.append_code_point(to_ascii_lowercase(current_input_character.value()));
continue; continue;
} }
ON(0) ON(0)
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.name.append_code_point(0xFFFD); m_current_builder.append_code_point(0xFFFD);
continue; continue;
} }
ON_EOF ON_EOF
@ -516,7 +524,7 @@ _StartOfFunction:
} }
ANYTHING_ELSE ANYTHING_ELSE
{ {
m_current_token.m_doctype.name.append_code_point(current_input_character.value()); m_current_builder.append_code_point(current_input_character.value());
continue; continue;
} }
} }
@ -563,14 +571,12 @@ _StartOfFunction:
ON('"') ON('"')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier.clear();
m_current_token.m_doctype.missing_public_identifier = false; m_current_token.m_doctype.missing_public_identifier = false;
SWITCH_TO(DOCTYPEPublicIdentifierDoubleQuoted); SWITCH_TO(DOCTYPEPublicIdentifierDoubleQuoted);
} }
ON('\'') ON('\'')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier.clear();
m_current_token.m_doctype.missing_public_identifier = false; m_current_token.m_doctype.missing_public_identifier = false;
SWITCH_TO(DOCTYPEPublicIdentifierSingleQuoted); SWITCH_TO(DOCTYPEPublicIdentifierSingleQuoted);
} }
@ -605,14 +611,14 @@ _StartOfFunction:
ON('"') ON('"')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier.clear(); m_current_token.m_doctype.system_identifier = {};
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted); SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted);
} }
ON('\'') ON('\'')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier.clear(); m_current_token.m_doctype.system_identifier = {};
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted); SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted);
} }
@ -646,13 +652,11 @@ _StartOfFunction:
} }
ON('"') ON('"')
{ {
m_current_token.m_doctype.public_identifier.clear();
m_current_token.m_doctype.missing_public_identifier = false; m_current_token.m_doctype.missing_public_identifier = false;
SWITCH_TO(DOCTYPEPublicIdentifierDoubleQuoted); SWITCH_TO(DOCTYPEPublicIdentifierDoubleQuoted);
} }
ON('\'') ON('\'')
{ {
m_current_token.m_doctype.public_identifier.clear();
m_current_token.m_doctype.missing_public_identifier = false; m_current_token.m_doctype.missing_public_identifier = false;
SWITCH_TO(DOCTYPEPublicIdentifierSingleQuoted); SWITCH_TO(DOCTYPEPublicIdentifierSingleQuoted);
} }
@ -686,13 +690,11 @@ _StartOfFunction:
} }
ON('"') ON('"')
{ {
m_current_token.m_doctype.system_identifier.clear();
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted); SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted);
} }
ON('\'') ON('\'')
{ {
m_current_token.m_doctype.system_identifier.clear();
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted); SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted);
} }
@ -722,17 +724,19 @@ _StartOfFunction:
{ {
ON('"') ON('"')
{ {
m_current_token.m_doctype.public_identifier = consume_current_builder();
SWITCH_TO(AfterDOCTYPEPublicIdentifier); SWITCH_TO(AfterDOCTYPEPublicIdentifier);
} }
ON(0) ON(0)
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier.append_code_point(0xFFFD); m_current_builder.append_code_point(0xFFFD);
continue; continue;
} }
ON('>') ON('>')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier = consume_current_builder();
m_current_token.m_doctype.force_quirks = true; m_current_token.m_doctype.force_quirks = true;
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data); SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
} }
@ -745,7 +749,7 @@ _StartOfFunction:
} }
ANYTHING_ELSE ANYTHING_ELSE
{ {
m_current_token.m_doctype.public_identifier.append_code_point(current_input_character.value()); m_current_builder.append_code_point(current_input_character.value());
continue; continue;
} }
} }
@ -755,17 +759,19 @@ _StartOfFunction:
{ {
ON('\'') ON('\'')
{ {
m_current_token.m_doctype.public_identifier = consume_current_builder();
SWITCH_TO(AfterDOCTYPEPublicIdentifier); SWITCH_TO(AfterDOCTYPEPublicIdentifier);
} }
ON(0) ON(0)
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier.append_code_point(0xFFFD); m_current_builder.append_code_point(0xFFFD);
continue; continue;
} }
ON('>') ON('>')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier = consume_current_builder();
m_current_token.m_doctype.force_quirks = true; m_current_token.m_doctype.force_quirks = true;
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data); SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
} }
@ -778,7 +784,7 @@ _StartOfFunction:
} }
ANYTHING_ELSE ANYTHING_ELSE
{ {
m_current_token.m_doctype.public_identifier.append_code_point(current_input_character.value()); m_current_builder.append_code_point(current_input_character.value());
continue; continue;
} }
} }
@ -788,17 +794,19 @@ _StartOfFunction:
{ {
ON('"') ON('"')
{ {
m_current_token.m_doctype.public_identifier = consume_current_builder();
SWITCH_TO(AfterDOCTYPESystemIdentifier); SWITCH_TO(AfterDOCTYPESystemIdentifier);
} }
ON(0) ON(0)
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier.append_code_point(0xFFFD); m_current_builder.append_code_point(0xFFFD);
continue; continue;
} }
ON('>') ON('>')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.public_identifier = consume_current_builder();
m_current_token.m_doctype.force_quirks = true; m_current_token.m_doctype.force_quirks = true;
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data); SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
} }
@ -811,7 +819,7 @@ _StartOfFunction:
} }
ANYTHING_ELSE ANYTHING_ELSE
{ {
m_current_token.m_doctype.system_identifier.append_code_point(current_input_character.value()); m_current_builder.append_code_point(current_input_character.value());
continue; continue;
} }
} }
@ -821,17 +829,19 @@ _StartOfFunction:
{ {
ON('\'') ON('\'')
{ {
m_current_token.m_doctype.system_identifier = consume_current_builder();
SWITCH_TO(AfterDOCTYPESystemIdentifier); SWITCH_TO(AfterDOCTYPESystemIdentifier);
} }
ON(0) ON(0)
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier.append_code_point(0xFFFD); m_current_builder.append_code_point(0xFFFD);
continue; continue;
} }
ON('>') ON('>')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier = consume_current_builder();
m_current_token.m_doctype.force_quirks = true; m_current_token.m_doctype.force_quirks = true;
SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data); SWITCH_TO_AND_EMIT_CURRENT_TOKEN(Data);
} }
@ -844,7 +854,7 @@ _StartOfFunction:
} }
ANYTHING_ELSE ANYTHING_ELSE
{ {
m_current_token.m_doctype.system_identifier.append_code_point(current_input_character.value()); m_current_builder.append_code_point(current_input_character.value());
continue; continue;
} }
} }
@ -863,14 +873,12 @@ _StartOfFunction:
ON('"') ON('"')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier.clear();
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted); SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted);
} }
ON('\'') ON('\'')
{ {
log_parse_error(); log_parse_error();
m_current_token.m_doctype.system_identifier.clear();
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted); SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted);
} }
@ -902,13 +910,11 @@ _StartOfFunction:
} }
ON('"') ON('"')
{ {
m_current_token.m_doctype.system_identifier.clear();
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted); SWITCH_TO(DOCTYPESystemIdentifierDoubleQuoted);
} }
ON('\'') ON('\'')
{ {
m_current_token.m_doctype.system_identifier.clear();
m_current_token.m_doctype.missing_system_identifier = false; m_current_token.m_doctype.missing_system_identifier = false;
SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted); SWITCH_TO(DOCTYPESystemIdentifierSingleQuoted);
} }
@ -2681,4 +2687,11 @@ void HTMLTokenizer::restore_to(const Utf8CodePointIterator& new_iterator)
m_utf8_iterator = new_iterator; m_utf8_iterator = new_iterator;
} }
String HTMLTokenizer::consume_current_builder()
{
auto string = m_current_builder.to_string();
m_current_builder.clear();
return string;
}
} }

2
Userland/Libraries/LibWeb/HTML/Parser/HTMLTokenizer.h
View file

@ -127,6 +127,7 @@ private:
bool consume_next_if_match(const StringView&, CaseSensitivity = CaseSensitivity::CaseSensitive); bool consume_next_if_match(const StringView&, CaseSensitivity = CaseSensitivity::CaseSensitive);
void create_new_token(HTMLToken::Type); void create_new_token(HTMLToken::Type);
bool current_end_tag_token_is_appropriate() const; bool current_end_tag_token_is_appropriate() const;
String consume_current_builder();
static const char* state_name(State state) static const char* state_name(State state)
{ {
@ -163,6 +164,7 @@ private:
Utf8CodePointIterator m_prev_utf8_iterator; Utf8CodePointIterator m_prev_utf8_iterator;
HTMLToken m_current_token; HTMLToken m_current_token;
StringBuilder m_current_builder;
Optional<String> m_last_emitted_start_tag_name; Optional<String> m_last_emitted_start_tag_name;