From c8a4fc6c1afc5b11799053d90915d51c4e5f3d83 Mon Sep 17 00:00:00 2001 From: Shannon Booth Date: Sun, 5 Nov 2023 11:50:00 +1300 Subject: [PATCH] LibWeb: Port HTML parser quirk public IDs to StringView These were DeprecatedFlyStrings, but had no reason to be. We were not making use of the O(1) lookup, so instead of porting it over to a FlyString, just make it a StringView. --- .../LibWeb/HTML/Parser/HTMLParser.cpp | 114 +++++++++--------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp b/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp index 1ad7edbe96d..dd14b40c846 100644 --- a/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp +++ b/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp @@ -49,62 +49,62 @@ static inline void log_parse_error(SourceLocation const& location = SourceLocati dbgln_if(HTML_PARSER_DEBUG, "Parse error! {}", location); } -static Vector s_quirks_public_ids = { - "+//Silmaril//dtd html Pro v0r11 19970101//", - "-//AS//DTD HTML 3.0 asWedit + extensions//", - "-//AdvaSoft Ltd//DTD HTML 3.0 asWedit + extensions//", - "-//IETF//DTD HTML 2.0 Level 1//", - "-//IETF//DTD HTML 2.0 Level 2//", - "-//IETF//DTD HTML 2.0 Strict Level 1//", - "-//IETF//DTD HTML 2.0 Strict Level 2//", - "-//IETF//DTD HTML 2.0 Strict//", - "-//IETF//DTD HTML 2.0//", - "-//IETF//DTD HTML 2.1E//", - "-//IETF//DTD HTML 3.0//", - "-//IETF//DTD HTML 3.2 Final//", - "-//IETF//DTD HTML 3.2//", - "-//IETF//DTD HTML 3//", - "-//IETF//DTD HTML Level 0//", - "-//IETF//DTD HTML Level 1//", - "-//IETF//DTD HTML Level 2//", - "-//IETF//DTD HTML Level 3//", - "-//IETF//DTD HTML Strict Level 0//", - "-//IETF//DTD HTML Strict Level 1//", - "-//IETF//DTD HTML Strict Level 2//", - "-//IETF//DTD HTML Strict Level 3//", - "-//IETF//DTD HTML Strict//", - "-//IETF//DTD HTML//", - "-//Metrius//DTD Metrius Presentational//", - "-//Microsoft//DTD Internet Explorer 2.0 HTML Strict//", - "-//Microsoft//DTD Internet Explorer 2.0 HTML//", - "-//Microsoft//DTD Internet Explorer 2.0 Tables//", - "-//Microsoft//DTD Internet Explorer 3.0 HTML Strict//", - "-//Microsoft//DTD Internet Explorer 3.0 HTML//", - "-//Microsoft//DTD Internet Explorer 3.0 Tables//", - "-//Netscape Comm. Corp.//DTD HTML//", - "-//Netscape Comm. Corp.//DTD Strict HTML//", - "-//O'Reilly and Associates//DTD HTML 2.0//", - "-//O'Reilly and Associates//DTD HTML Extended 1.0//", - "-//O'Reilly and Associates//DTD HTML Extended Relaxed 1.0//", - "-//SQ//DTD HTML 2.0 HoTMetaL + extensions//", - "-//SoftQuad Software//DTD HoTMetaL PRO 6.0::19990601::extensions to HTML 4.0//", - "-//SoftQuad//DTD HoTMetaL PRO 4.0::19971010::extensions to HTML 4.0//", - "-//Spyglass//DTD HTML 2.0 Extended//", - "-//Sun Microsystems Corp.//DTD HotJava HTML//", - "-//Sun Microsystems Corp.//DTD HotJava Strict HTML//", - "-//W3C//DTD HTML 3 1995-03-24//", - "-//W3C//DTD HTML 3.2 Draft//", - "-//W3C//DTD HTML 3.2 Final//", - "-//W3C//DTD HTML 3.2//", - "-//W3C//DTD HTML 3.2S Draft//", - "-//W3C//DTD HTML 4.0 Frameset//", - "-//W3C//DTD HTML 4.0 Transitional//", - "-//W3C//DTD HTML Experimental 19960712//", - "-//W3C//DTD HTML Experimental 970421//", - "-//W3C//DTD W3 HTML//", - "-//W3O//DTD W3 HTML 3.0//", - "-//WebTechs//DTD Mozilla HTML 2.0//", - "-//WebTechs//DTD Mozilla HTML//" +static Vector const s_quirks_public_ids = { + "+//Silmaril//dtd html Pro v0r11 19970101//"sv, + "-//AS//DTD HTML 3.0 asWedit + extensions//"sv, + "-//AdvaSoft Ltd//DTD HTML 3.0 asWedit + extensions//"sv, + "-//IETF//DTD HTML 2.0 Level 1//"sv, + "-//IETF//DTD HTML 2.0 Level 2//"sv, + "-//IETF//DTD HTML 2.0 Strict Level 1//"sv, + "-//IETF//DTD HTML 2.0 Strict Level 2//"sv, + "-//IETF//DTD HTML 2.0 Strict//"sv, + "-//IETF//DTD HTML 2.0//"sv, + "-//IETF//DTD HTML 2.1E//"sv, + "-//IETF//DTD HTML 3.0//"sv, + "-//IETF//DTD HTML 3.2 Final//"sv, + "-//IETF//DTD HTML 3.2//"sv, + "-//IETF//DTD HTML 3//"sv, + "-//IETF//DTD HTML Level 0//"sv, + "-//IETF//DTD HTML Level 1//"sv, + "-//IETF//DTD HTML Level 2//"sv, + "-//IETF//DTD HTML Level 3//"sv, + "-//IETF//DTD HTML Strict Level 0//"sv, + "-//IETF//DTD HTML Strict Level 1//"sv, + "-//IETF//DTD HTML Strict Level 2//"sv, + "-//IETF//DTD HTML Strict Level 3//"sv, + "-//IETF//DTD HTML Strict//"sv, + "-//IETF//DTD HTML//"sv, + "-//Metrius//DTD Metrius Presentational//"sv, + "-//Microsoft//DTD Internet Explorer 2.0 HTML Strict//"sv, + "-//Microsoft//DTD Internet Explorer 2.0 HTML//"sv, + "-//Microsoft//DTD Internet Explorer 2.0 Tables//"sv, + "-//Microsoft//DTD Internet Explorer 3.0 HTML Strict//"sv, + "-//Microsoft//DTD Internet Explorer 3.0 HTML//"sv, + "-//Microsoft//DTD Internet Explorer 3.0 Tables//"sv, + "-//Netscape Comm. Corp.//DTD HTML//"sv, + "-//Netscape Comm. Corp.//DTD Strict HTML//"sv, + "-//O'Reilly and Associates//DTD HTML 2.0//"sv, + "-//O'Reilly and Associates//DTD HTML Extended 1.0//"sv, + "-//O'Reilly and Associates//DTD HTML Extended Relaxed 1.0//"sv, + "-//SQ//DTD HTML 2.0 HoTMetaL + extensions//"sv, + "-//SoftQuad Software//DTD HoTMetaL PRO 6.0::19990601::extensions to HTML 4.0//"sv, + "-//SoftQuad//DTD HoTMetaL PRO 4.0::19971010::extensions to HTML 4.0//"sv, + "-//Spyglass//DTD HTML 2.0 Extended//"sv, + "-//Sun Microsystems Corp.//DTD HotJava HTML//"sv, + "-//Sun Microsystems Corp.//DTD HotJava Strict HTML//"sv, + "-//W3C//DTD HTML 3 1995-03-24//"sv, + "-//W3C//DTD HTML 3.2 Draft//"sv, + "-//W3C//DTD HTML 3.2 Final//"sv, + "-//W3C//DTD HTML 3.2//"sv, + "-//W3C//DTD HTML 3.2S Draft//"sv, + "-//W3C//DTD HTML 4.0 Frameset//"sv, + "-//W3C//DTD HTML 4.0 Transitional//"sv, + "-//W3C//DTD HTML Experimental 19960712//"sv, + "-//W3C//DTD HTML Experimental 970421//"sv, + "-//W3C//DTD W3 HTML//"sv, + "-//W3O//DTD W3 HTML 3.0//"sv, + "-//WebTechs//DTD Mozilla HTML 2.0//"sv, + "-//WebTechs//DTD Mozilla HTML//"sv, }; // https://html.spec.whatwg.org/multipage/parsing.html#mathml-text-integration-point @@ -456,7 +456,7 @@ DOM::QuirksMode HTMLParser::which_quirks_mode(HTMLToken const& doctype_token) co if (system_identifier.equals_ignoring_ascii_case("http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"sv)) return DOM::QuirksMode::Yes; - for (auto& public_id : s_quirks_public_ids) { + for (auto const& public_id : s_quirks_public_ids) { if (public_identifier.starts_with_bytes(public_id, CaseSensitivity::CaseInsensitive)) return DOM::QuirksMode::Yes; }